Fix first time switching from classic to GTK theme.

chrome/browser/themes/theme_service_aurax11.cc

 // Copyright 2013 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/themes/theme_service_aurax11.h"
 
 #include "base/bind.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/themes/custom_theme_supplier.h"
@@ skipping 25 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(SystemThemeX11);
 };
 
 SystemThemeX11::SystemThemeX11(PrefService* pref_service)
     : CustomThemeSupplier(NATIVE_X11),
       linux_ui_(views::LinuxUI::instance()),
       pref_service_(pref_service) {}
 
 void SystemThemeX11::StartUsingTheme() {
   pref_service_->SetBoolean(prefs::kUsesSystemTheme, true);
-  // Have the former theme notify its observers of change.
+  // Both old and new themes' observers should be notified of the change.

[Elliot Glaysher, 2014/06/13 20:05:54]

Could you please expand this comment to include more information that you put in
the commit message? This is hack, and should have a bigger explanation.

[Evan Stade, 2014/06/13 20:14:39]

Done.

+  if (linux_ui_)
+    linux_ui_->GetNativeTheme(NULL)->NotifyObservers();
   ui::NativeThemeAura::instance()->NotifyObservers();
 }
 
 void SystemThemeX11::StopUsingTheme() {
   pref_service_->SetBoolean(prefs::kUsesSystemTheme, false);
-  // Have the former theme notify its observers of change.
+  // Both old and new themes' observers should be notified of the change.
+  ui::NativeThemeAura::instance()->NotifyObservers();
   if (linux_ui_)
     linux_ui_->GetNativeTheme(NULL)->NotifyObservers();
 }
 
 bool SystemThemeX11::GetColor(int id, SkColor* color) const {
   return linux_ui_ && linux_ui_->GetColor(id, color);
 }
 
 gfx::Image SystemThemeX11::GetImageNamed(int id) {
   return linux_ui_ ? linux_ui_->GetThemeImageNamed(id) : gfx::Image();
@@ skipping 21 matching lines @@
 
 bool ThemeServiceAuraX11::UsingDefaultTheme() const {
   return ThemeService::UsingDefaultTheme() && !UsingSystemTheme();
 }
 
 bool ThemeServiceAuraX11::UsingSystemTheme() const {
   const CustomThemeSupplier* theme_supplier = get_theme_supplier();
   return theme_supplier &&
          theme_supplier->get_theme_type() == CustomThemeSupplier::NATIVE_X11;
 }