linux_aura: Keep GTK state from leaking between profiles.

chrome/browser/ui/libgtk2ui/gtk2_ui.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/libgtk2ui/gtk2_ui.h"
 
 #include <set>
 
 #include "base/command_line.h"
 #include "base/environment.h"
@@ skipping 32 matching lines @@
 
 #if defined(USE_GCONF)
 #include "chrome/browser/ui/libgtk2ui/gconf_titlebar_listener.h"
 #endif
 
 // A minimized port of GtkThemeService into something that can provide colors
 // and images for aura.
 //
 // TODO(erg): There's still a lot that needs ported or done for the first time:
 //
-// - Render and inject the button overlay from the gtk theme.
 // - Render and inject the omnibox background.
 // - Listen for the "style-set" signal on |fake_frame_| and recreate theme
 //   colors and images.
 // - Make sure to test with a light on dark theme, too.
 // - Everything else that we're not doing.
 
 namespace {
 
 struct GObjectDeleter {
   void operator()(void* ptr) {
@@ skipping 244 matching lines @@
     default:
       color_utils::HSL result = {-1, -1, -1};
       return result;
   }
 }
 
 }  // namespace
 
 namespace libgtk2ui {
 
-Gtk2UI::Gtk2UI() : use_gtk_(false) {
+Gtk2UI::Gtk2UI() {
   GtkInitFromCommandLine(*CommandLine::ForCurrentProcess());
 }
 
 void Gtk2UI::Initialize() {
   // Create our fake widgets.
   fake_window_ = gtk_window_new(GTK_WINDOW_TOPLEVEL);
   fake_frame_ = chrome_gtk_frame_new();
   fake_label_.Own(gtk_label_new(""));
   fake_entry_.Own(gtk_entry_new());
 
@@ skipping 30 matching lines @@
 
   ClearAllThemeData();
 }
 
 gfx::Image Gtk2UI::GetThemeImageNamed(int id) const {
   // Try to get our cached version:
   ImageCache::const_iterator it = gtk_images_.find(id);
   if (it != gtk_images_.end())
     return it->second;
 
-  if (/*use_gtk_ && */ IsOverridableImage(id)) {
+  if (IsOverridableImage(id)) {
     gfx::Image image = gfx::Image(
         gfx::ImageSkia::CreateFrom1xBitmap(GenerateGtkThemeBitmap(id)));
     gtk_images_[id] = image;
     return image;
   }
 
   return gfx::Image();
 }
 
 bool Gtk2UI::GetColor(int id, SkColor* color) const {
@@ skipping 56 matching lines @@
   gint cursor_blink_time = kGtkDefaultCursorBlinkTime;
   gboolean cursor_blink = TRUE;
   g_object_get(gtk_settings_get_default(),
                "gtk-cursor-blink-time", &cursor_blink_time,
                "gtk-cursor-blink", &cursor_blink,
                NULL);
   return cursor_blink ? (cursor_blink_time / kGtkCursorBlinkCycleFactor) : 0.0;
 }
 
 ui::NativeTheme* Gtk2UI::GetNativeTheme() const {
-  return use_gtk_ ? NativeThemeGtk2::instance() :
-                    ui::NativeTheme::instance();
-}
-
-void Gtk2UI::SetUseSystemTheme(bool use_system_theme) {
-  use_gtk_ = use_system_theme;
-
-  FOR_EACH_OBSERVER(Gtk2Border, border_list_,
-                    InvalidateAndSetUsesGtk(use_system_theme));
-}
-
-bool Gtk2UI::GetUseSystemTheme() const {
-  return use_gtk_;
+  return NativeThemeGtk2::instance();
 }
 
 bool Gtk2UI::GetDefaultUsesSystemTheme() const {
   scoped_ptr<base::Environment> env(base::Environment::Create());
 
   switch (base::nix::GetDesktopEnvironment(env.get())) {
     case base::nix::DESKTOP_ENVIRONMENT_GNOME:
     case base::nix::DESKTOP_ENVIRONMENT_UNITY:
     case base::nix::DESKTOP_ENVIRONMENT_XFCE:
       return true;
@@ skipping 875 matching lines @@
 
 void Gtk2UI::ClearAllThemeData() {
   gtk_images_.clear();
 }
 
 }  // namespace libgtk2ui
 
 views::LinuxUI* BuildGtk2UI() {
   return new libgtk2ui::Gtk2UI;
 }