Linux - fix native theme selection during theme changes

chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.h"
 
 #include "base/command_line.h"
 #include "base/run_loop.h"
 #include "build/build_config.h"
 #include "chrome/browser/chrome_browser_main.h"
@@ skipping 43 matching lines @@
 
   Profile* profile = nullptr;
   // Window types not listed here (such as tooltips) will never use Chrome
   // theming.
   if (window->type() == ui::wm::WINDOW_TYPE_NORMAL ||
       window->type() == ui::wm::WINDOW_TYPE_POPUP) {
     profile = reinterpret_cast<Profile*>(
         window->GetNativeWindowProperty(Profile::kProfileKey));
   }
 
-  if (profile) {
-    ThemeService* ts = ThemeServiceFactory::GetForProfile(profile);
-    // If using the system (GTK) theme, don't use an Aura NativeTheme at all.
-    if (!ts->UsingSystemTheme()) {
-      // Use a dark theme for incognito browser windows that aren't
-      // custom-themed. Otherwise, normal Aura theme.
-      if (profile->GetProfileType() == Profile::INCOGNITO_PROFILE &&
-          ts->UsingDefaultTheme() &&
-          BrowserView::GetBrowserViewForNativeWindow(window)) {
-        return ui::NativeThemeDarkAura::instance();
-      }
+  // If using the system (GTK) theme, don't use an Aura NativeTheme at all.
+  // NB: ThemeService::UsingSystemTheme() might lag behind this pref. See
+  // http://crbug.com/585522
+  if (!profile || profile->GetPrefs()->GetBoolean(prefs::kUsesSystemTheme))
+    return nullptr;
 
-      return ui::NativeThemeAura::instance();
-    }
+  // Use a dark theme for incognito browser windows that aren't
+  // custom-themed. Otherwise, normal Aura theme.
+  if (profile->GetProfileType() == Profile::INCOGNITO_PROFILE &&
+      ThemeServiceFactory::GetForProfile(profile)->UsingDefaultTheme() &&
+      BrowserView::GetBrowserViewForNativeWindow(window)) {
+    return ui::NativeThemeDarkAura::instance();
   }
 
-  return nullptr;
+  return ui::NativeThemeAura::instance();
 }
 #endif
 
 }  // namespace
 
 ChromeBrowserMainExtraPartsAura::ChromeBrowserMainExtraPartsAura() {
 }
 
 ChromeBrowserMainExtraPartsAura::~ChromeBrowserMainExtraPartsAura() {
 }
@@ skipping 65 matching lines @@
                            chrome::MESSAGE_BOX_TYPE_WARNING);
 
     // Avoids gpu_process_transport_factory.cc(153)] Check failed:
     // per_compositor_data_.empty() when quit is chosen.
     base::RunLoop().RunUntilIdle();
 
     exit(EXIT_FAILURE);
   }
 }
 #endif