GTK: Clean up the gtk extension infobar implementation.

chrome/browser/ui/gtk/custom_button.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_GTK_CUSTOM_BUTTON_H_
 #define CHROME_BROWSER_UI_GTK_CUSTOM_BUTTON_H_
 #pragma once
 
 #include <gtk/gtk.h>
 
@@ skipping 140 matching lines @@
                    int normal_id,
                    int pressed_id,
                    int hover_id,
                    int disabled_id,
                    GtkWidget* native_widget);
 
   virtual ~CustomDrawButton();
 
   void Init();
 
+  // Make this CustomDrawButton always use the chrome style rendering; it will
+  // never render gtk-like.
+  void ForceChromeTheme();
+
   // Flip the image horizontally. Not to be used for RTL/LTR reasons. (In RTL
   // mode, this will unflip the image.)
   void set_flipped(bool flipped) { button_base_.set_flipped(flipped); }
 
   GtkWidget* widget() const { return widget_.get(); }
 
   gfx::Rect bounds() const {
       return gfx::Rect(widget_->allocation.x,
                        widget_->allocation.y,
                        widget_->allocation.width,
@@ skipping 44 matching lines @@
   CustomDrawButtonBase button_base_;
 
   CustomDrawHoverController hover_controller_;
 
   // The widget to use when we are displaying in GTK+ theme mode.
   ui::OwnedWidgetGtk native_widget_;
 
   // Our theme provider.
   GtkThemeService* theme_service_;
 
+  // Some buttons are always drawn in chrome style because they are part of
+  // HTML extensions.

[Evan Stade, 2011/08/31 20:00:12]

explaining the current use of this var is a little extraneous / prone to getting
stale

+  bool forcing_chrome_theme_;
+
   // Used to listen for theme change notifications.
   NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(CustomDrawButton);
 };
 
 #endif  // CHROME_BROWSER_UI_GTK_CUSTOM_BUTTON_H_