Uplift of #2219 (squashed) to beta

brave · Apr 24, 2019 · d7b8e02 · d7b8e02
1 parent 3632186
commit d7b8e02
Showing 1 changed file with 16 additions and 0 deletions.
diff --git a/patches/ui-native_theme-native_theme_win.cc.patch b/patches/ui-native_theme-native_theme_win.cc.patch
@@ -0,0 +1,16 @@
+diff --git a/ui/native_theme/native_theme_win.cc b/ui/native_theme/native_theme_win.cc
+index 0df107bf9757a81897e9312a9eba977b8a173646..61e4f4ce671c5e0f92208b54aade903110ddc7a7 100644
+--- a/ui/native_theme/native_theme_win.cc
++++ b/ui/native_theme/native_theme_win.cc
+@@ -1934,7 +1934,11 @@ void NativeThemeWin::RegisterThemeRegkeyObserver() {
+   DCHECK(hkcu_themes_regkey_.Valid());
+   hkcu_themes_regkey_.StartWatching(base::BindOnce(
+       [](NativeThemeWin* native_theme) {
++#if defined(BRAVE_CHROMIUM_BUILD)
++        NotifyProperThemeObserver();
++#else
+         native_theme->NotifyObservers();
++#endif
+         // RegKey::StartWatching only provides one notification. Reregistration
+         // is required to get future notifications.
+         native_theme->RegisterThemeRegkeyObserver();