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

chrome/browser/ui/gtk/custom_button.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/gtk/custom_button.h"
 
 #include "base/basictypes.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "chrome/browser/ui/gtk/gtk_chrome_button.h"
 #include "chrome/browser/ui/gtk/gtk_theme_service.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/public/browser/notification_source.h"
+#include "grit/theme_resources.h"
 #include "grit/ui_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/gtk_util.h"
 #include "ui/gfx/image/cairo_cached_surface.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/skbitmap_operations.h"
 
 namespace {
 
@@ skipping 323 matching lines @@
   if (UseGtkTheme()) {
     // Continue processing this expose event.
     return FALSE;
   } else {
     double hover_state = hover_controller_.GetCurrentValue();
     return button_base_.OnExpose(sender, e, hover_state);
   }
 }
 
 // static
-CustomDrawButton* CustomDrawButton::CloseButton(
+CustomDrawButton* CustomDrawButton::CloseButtonBar(
     GtkThemeService* theme_provider) {
-  CustomDrawButton* button = new CustomDrawButton(theme_provider, IDR_CLOSE_BAR,
-      IDR_CLOSE_BAR_P, IDR_CLOSE_BAR_H, 0, GTK_STOCK_CLOSE, GTK_ICON_SIZE_MENU);
+  CustomDrawButton* button = new CustomDrawButton(theme_provider,
+      IDR_CLOSE_1, IDR_CLOSE_1_P, IDR_CLOSE_1_H, 0,
+      GTK_STOCK_CLOSE, GTK_ICON_SIZE_MENU);
   return button;
 }
 
+// static
+CustomDrawButton* CustomDrawButton::CloseButtonBubble(
+    GtkThemeService* theme_provider) {
+  CustomDrawButton* button = new CustomDrawButton(theme_provider,
+      IDR_CLOSE_2, IDR_CLOSE_2_P, IDR_CLOSE_2_H, 0,
+      GTK_STOCK_CLOSE, GTK_ICON_SIZE_MENU);
+  return button;
+}
+
 void CustomDrawButton::SetBrowserTheme() {
   if (UseGtkTheme()) {
     if (native_widget_.get())
       gtk_button_set_image(GTK_BUTTON(widget()), native_widget_.get());
     gtk_widget_set_size_request(widget(), -1, -1);
     gtk_widget_set_app_paintable(widget(), FALSE);
   } else {
     if (native_widget_.get())
       gtk_button_set_image(GTK_BUTTON(widget()), NULL);
     gtk_widget_set_size_request(widget(), button_base_.Width(),
                                 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 !forcing_chrome_theme_ && theme_service_ &&
       theme_service_->UsingNativeTheme();
 }