GTK: Clean up the gtk extension infobar implementation.

chrome/browser/ui/gtk/custom_button.cc

 // Copyright (c) 2011 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/gtk/custom_button.h"
 
 #include "base/basictypes.h"
 #include "chrome/browser/ui/gtk/cairo_cached_surface.h"
 #include "chrome/browser/ui/gtk/gtk_chrome_button.h"
 #include "chrome/browser/ui/gtk/gtk_theme_service.h"
@@ skipping 220 matching lines @@
 
 CustomDrawButton::CustomDrawButton(GtkThemeService* theme_provider,
                                    int normal_id,
                                    int pressed_id,
                                    int hover_id,
                                    int disabled_id,
                                    const char* stock_id,
                                    GtkIconSize stock_size)
     : button_base_(theme_provider, normal_id, pressed_id, hover_id,
                    disabled_id),
-      theme_service_(theme_provider) {
+      theme_service_(theme_provider),
+      forcing_browser_theme_(false) {
   native_widget_.Own(gtk_image_new_from_stock(stock_id, stock_size));
 
   Init();
 
   theme_service_->InitThemesFor(this);
   registrar_.Add(this,
                  chrome::NOTIFICATION_BROWSER_THEME_CHANGED,
                  Source<ThemeService>(theme_provider));
 }
 
 CustomDrawButton::CustomDrawButton(GtkThemeService* theme_provider,
                                    int normal_id,
                                    int pressed_id,
                                    int hover_id,
                                    int disabled_id,
                                    GtkWidget* native_widget)
     : button_base_(theme_provider, normal_id, pressed_id, hover_id,
                    disabled_id),
       native_widget_(native_widget),
-      theme_service_(theme_provider) {
+      theme_service_(theme_provider),
+      forcing_browser_theme_(false) {
   Init();
 
   theme_service_->InitThemesFor(this);
   registrar_.Add(this,
                  chrome::NOTIFICATION_BROWSER_THEME_CHANGED,
                  Source<ThemeService>(theme_provider));
 }
 
 CustomDrawButton::~CustomDrawButton() {
   widget_.Destroy();
   native_widget_.Destroy();
 }
 
 void CustomDrawButton::Init() {
   widget_.Own(gtk_chrome_button_new());
   gtk_widget_set_can_focus(widget(), FALSE);
   g_signal_connect(widget(), "expose-event",
                    G_CALLBACK(OnCustomExposeThunk), this);
   hover_controller_.Init(widget());
 }
 
+void CustomDrawButton::ForceBrowserTheme() {
+  forcing_browser_theme_ = true;
+  SetBrowserTheme();
+}
+
 void CustomDrawButton::Observe(int type,
     const NotificationSource& source, const NotificationDetails& details) {
   DCHECK(chrome::NOTIFICATION_BROWSER_THEME_CHANGED == type);
   SetBrowserTheme();
 }
 
 int CustomDrawButton::SurfaceWidth() const {
   return button_base_.Width();
 }
 
@@ skipping 50 matching lines @@
                                 button_base_.Height());
 
     gtk_widget_set_app_paintable(widget(), TRUE);
   }
 
   gtk_chrome_button_set_use_gtk_rendering(
       GTK_CHROME_BUTTON(widget()), UseGtkTheme());
 }
 
 bool CustomDrawButton::UseGtkTheme() {
-  return theme_service_ && theme_service_->UsingNativeTheme();
+  return !forcing_browser_theme_ && theme_service_ &&
+      theme_service_->UsingNativeTheme();
 }