Inconsistent use of [x] close panel icon. Code changes.

chrome/browser/ui/gtk/custom_button.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_GTK_CUSTOM_BUTTON_H_
 #define CHROME_BROWSER_UI_GTK_CUSTOM_BUTTON_H_
 
 #include <gtk/gtk.h>
 
 #include "base/compiler_specific.h"
@@ skipping 179 matching lines @@
   // Set the background details.
   void SetBackground(SkColor color,
                      const SkBitmap& image,
                      const SkBitmap& mask);
 
   // content::NotificationObserver implementation.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
-  // Returns a standard close button. Pass a |theme_provider| to use Gtk icons
-  // in Gtk rendering mode.
-  static CustomDrawButton* CloseButton(GtkThemeService* theme_provider);
+  // Returns a standard close button used for infobars and shelves (smaller
+  // with red hover).
+  // Pass a |theme_provider| to use Gtk icons in Gtk rendering mode.
+  static CustomDrawButton* CloseButtonBar(GtkThemeService* theme_provider);
+
+  // Returns a standard close button used for bubbles (larger).
+  // Pass a |theme_provider| to use Gtk icons in Gtk rendering mode.
+  static CustomDrawButton* CloseButtonBubble(GtkThemeService* theme_provider);
 
  private:
   // Sets the button to themed or not.
   void SetBrowserTheme();
 
   // Whether to use the GTK+ theme. For this to be true, we have to be in GTK+
   // theme mode and we must have a valid stock icon resource.
   bool UseGtkTheme();
 
   // Callback for custom button expose, used to draw the custom graphics.
@@ skipping 16 matching lines @@
   // True if we should never do gtk rendering.
   bool forcing_chrome_theme_;
 
   // Used to listen for theme change notifications.
   content::NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(CustomDrawButton);
 };
 
 #endif  // CHROME_BROWSER_UI_GTK_CUSTOM_BUTTON_H_