4 files changed, 21 insertions, 10 deletions
diff --git a/chrome/browser/themes/theme_service_aurax11.cc b/chrome/browser/themes/theme_service_aurax11.cc
index 6dad99d..1e596e3 100644
--- a/chrome/browser/themes/theme_service_aurax11.cc
+++ b/chrome/browser/themes/theme_service_aurax11.cc
@@ -29,7 +29,7 @@ class NativeThemeX11 : public CustomThemeSupplier {
   virtual ~NativeThemeX11();
 
   // These pointers are not owned by us.
-  const views::LinuxUI* const linux_ui_;
+  views::LinuxUI* const linux_ui_;
   PrefService* const pref_service_;
 
   DISALLOW_COPY_AND_ASSIGN(NativeThemeX11);
@@ -41,10 +41,16 @@ NativeThemeX11::NativeThemeX11(PrefService* pref_service)
       pref_service_(pref_service) {}
 
 void NativeThemeX11::StartUsingTheme() {
+  if (linux_ui_)
+    linux_ui_->SetUseSystemTheme(true);
+
   pref_service_->SetBoolean(prefs::kUsesSystemTheme, true);
 }
 
 void NativeThemeX11::StopUsingTheme() {
+  if (linux_ui_)
+    linux_ui_->SetUseSystemTheme(false);
+
   pref_service_->SetBoolean(prefs::kUsesSystemTheme, false);
 }
 
diff --git a/chrome/browser/ui/libgtk2ui/gtk2_ui.cc b/chrome/browser/ui/libgtk2ui/gtk2_ui.cc
index a7b1839..6362923 100644
--- a/chrome/browser/ui/libgtk2ui/gtk2_ui.cc
+++ b/chrome/browser/ui/libgtk2ui/gtk2_ui.cc
@@ -310,7 +310,7 @@ color_utils::HSL GetDefaultTint(int id) {
 
 namespace libgtk2ui {
 
-Gtk2UI::Gtk2UI() {
+Gtk2UI::Gtk2UI() : use_gtk_(false) {
   GtkInitFromCommandLine(*CommandLine::ForCurrentProcess());
 }
 
@@ -350,10 +350,6 @@ Gtk2UI::~Gtk2UI() {
   ClearAllThemeData();
 }
 
-bool Gtk2UI::UseNativeTheme() const {
-  return true;
-}
-
 gfx::Image Gtk2UI::GetThemeImageNamed(int id) const {
   // Try to get our cached version:
   ImageCache::const_iterator it = gtk_images_.find(id);
@@ -437,7 +433,12 @@ double Gtk2UI::GetCursorBlinkInterval() const {
 }
 
 ui::NativeTheme* Gtk2UI::GetNativeTheme() const {
-  return NativeThemeGtk2::instance();
+  return use_gtk_ ? NativeThemeGtk2::instance() :
+                    ui::NativeTheme::instance();
+}
+
+void Gtk2UI::SetUseSystemTheme(bool use_system_theme) {
+  use_gtk_ = use_system_theme;
 }
 
 bool Gtk2UI::GetDefaultUsesSystemTheme() const {
diff --git a/chrome/browser/ui/libgtk2ui/gtk2_ui.h b/chrome/browser/ui/libgtk2ui/gtk2_ui.h
index e86f747..52fd121 100644
--- a/chrome/browser/ui/libgtk2ui/gtk2_ui.h
+++ b/chrome/browser/ui/libgtk2ui/gtk2_ui.h
@@ -52,7 +52,6 @@ class Gtk2UI : public views::LinuxUI {
 
   // ui::LinuxUI:
   virtual void Initialize() OVERRIDE;
-  virtual bool UseNativeTheme() const OVERRIDE;
   virtual gfx::Image GetThemeImageNamed(int id) const OVERRIDE;
   virtual bool GetColor(int id, SkColor* color) const OVERRIDE;
   virtual bool HasCustomImage(int id) const OVERRIDE;
@@ -66,6 +65,7 @@ class Gtk2UI : public views::LinuxUI {
   virtual SkColor GetInactiveSelectionFgColor() const OVERRIDE;
   virtual double GetCursorBlinkInterval() const OVERRIDE;
   virtual ui::NativeTheme* GetNativeTheme() const OVERRIDE;
+  virtual void SetUseSystemTheme(bool use_system_theme) OVERRIDE;
   virtual bool GetDefaultUsesSystemTheme() const OVERRIDE;
   virtual void SetDownloadCount(int count) const OVERRIDE;
   virtual void SetProgressFraction(float percentage) const OVERRIDE;
@@ -202,6 +202,9 @@ class Gtk2UI : public views::LinuxUI {
   // Image cache of lazily created images.
   mutable ImageCache gtk_images_;
 
+  // Whether to use the Gtk2 version of the native theme.
+  bool use_gtk_;
+
   DISALLOW_COPY_AND_ASSIGN(Gtk2UI);
 };
 
diff --git a/ui/views/linux_ui/linux_ui.h b/ui/views/linux_ui/linux_ui.h
index 09c78a1..8355e98 100644
--- a/ui/views/linux_ui/linux_ui.h
+++ b/ui/views/linux_ui/linux_ui.h
@@ -49,8 +49,7 @@ class VIEWS_EXPORT LinuxUI : public ui::LinuxInputMethodContextFactory,
 
   virtual void Initialize() = 0;
 
-  // Returns an themed image per theme_provider.h
-  virtual bool UseNativeTheme() const = 0;
+  // Returns a themed image per theme_provider.h
   virtual gfx::Image GetThemeImageNamed(int id) const = 0;
   virtual bool GetColor(int id, SkColor* color) const = 0;
   virtual bool HasCustomImage(int id) const = 0;
@@ -70,6 +69,8 @@ class VIEWS_EXPORT LinuxUI : public ui::LinuxInputMethodContextFactory,
   // style widgets.
   virtual ui::NativeTheme* GetNativeTheme() const = 0;
 
+  virtual void SetUseSystemTheme(bool use_system_theme) = 0;
+
   // Returns whether we should be using the native theme provided by this
   // object by default.
   virtual bool GetDefaultUsesSystemTheme() const = 0;