linux_aura: Keep GTK state from leaking between profiles.

chrome/browser/ui/libgtk2ui/gtk2_border.cc

 // Copyright 2014 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_border.h"
 
 #include <gtk/gtk.h>
 
 #include "chrome/browser/ui/libgtk2ui/gtk2_ui.h"
 #include "third_party/skia/include/effects/SkLerpXfermode.h"
+#include "ui/base/theme_provider.h"
 #include "ui/gfx/animation/animation.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image_skia_source.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/native_theme_delegate.h"
 
 using views::Button;
 using views::NativeThemeDelegate;
@@ skipping 45 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(ButtonImageSkiaSource);
 };
 
 }  // namespace
 
 Gtk2Border::Gtk2Border(Gtk2UI* gtk2_ui,
                        views::LabelButton* owning_button,
                        scoped_ptr<views::Border> border)
     : gtk2_ui_(gtk2_ui),
-      use_gtk_(gtk2_ui_->GetUseSystemTheme()),
       owning_button_(owning_button),
       border_(border.Pass()) {
   gtk2_ui_->AddGtkBorder(this);
 }
 
 Gtk2Border::~Gtk2Border() {
   gtk2_ui_->RemoveGtkBorder(this);
 }
 
-void Gtk2Border::InvalidateAndSetUsesGtk(bool use_gtk) {
+void Gtk2Border::InvalidateGtkImages() {
   for (int i = 0; i < kNumberOfFocusedStates; ++i) {
     for (int j = 0; j < views::Button::STATE_COUNT; ++j) {
       button_images_[i][j] = gfx::ImageSkia();
     }
   }
 
   // Our owning view must have its layout invalidated because the insets could
   // have changed.
   owning_button_->InvalidateLayout();
-
-  use_gtk_ = use_gtk;
 }
 
 void Gtk2Border::Paint(const views::View& view, gfx::Canvas* canvas) {
-  if (!use_gtk_) {
+  ui::ThemeProvider* provider = owning_button_->GetThemeProvider();
+  if (!provider || !provider->UsingNativeTheme()) {
     border_->Paint(view, canvas);
     return;
   }
 
   DCHECK_EQ(&view, owning_button_);
   const NativeThemeDelegate* native_theme_delegate = owning_button_;
   gfx::Rect rect(native_theme_delegate->GetThemePaintRect());
   ui::NativeTheme::ExtraParams extra;
   ui::NativeTheme::State state = native_theme_delegate->GetThemeState(&extra);
 
@@ skipping 14 matching lines @@
     PaintState(state, extra, rect, canvas);
     canvas->sk_canvas()->restore();
 
     canvas->sk_canvas()->restore();
   } else {
     PaintState(state, extra, rect, canvas);
   }
 }
 
 gfx::Insets Gtk2Border::GetInsets() const {
-  if (!use_gtk_)
+  ui::ThemeProvider* provider = owning_button_->GetThemeProvider();
+  if (!provider || !provider->UsingNativeTheme())
     return border_->GetInsets();
 
   return gtk2_ui_->GetButtonInsets();
 }
 
 gfx::Size Gtk2Border::GetMinimumSize() const {
-  if (!use_gtk_)
+  ui::ThemeProvider* provider = owning_button_->GetThemeProvider();
+  if (!provider || !provider->UsingNativeTheme())
     return border_->GetMinimumSize();
 
   gfx::Insets insets = GetInsets();
   return gfx::Size(insets.width(), insets.height());
 }
 
 void Gtk2Border::PaintState(const ui::NativeTheme::State state,
                             const ui::NativeTheme::ExtraParams& extra,
                             const gfx::Rect& rect,
                             gfx::Canvas* canvas) {
@@ skipping 20 matching lines @@
     return true;
   } else if (owning_button_->style() == Button::STYLE_TEXTBUTTON) {
     return focused == false && (state == Button::STATE_HOVERED ||
                                 state == Button::STATE_PRESSED);
   }
 
   return false;
 }
 
 }  // namespace libgtk2ui