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

chrome/browser/ui/gtk/tabs/tab_renderer_gtk.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/tabs/tab_renderer_gtk.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/debug/trace_event.h"
@@ skipping 802 matching lines @@
                                  close_button_height_);
 
     // If the close button color has changed, generate a new one.
     if (theme_service_) {
       SkColor tab_text_color =
           theme_service_->GetColor(ThemeProperties::COLOR_TAB_TEXT);
       if (!close_button_color_ || tab_text_color != close_button_color_) {
         close_button_color_ = tab_text_color;
         ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
         close_button_->SetBackground(close_button_color_,
-            rb.GetImageNamed(IDR_TAB_CLOSE).AsBitmap(),
-            rb.GetImageNamed(IDR_TAB_CLOSE_MASK).AsBitmap());
+            rb.GetImageNamed(IDR_CLOSE_1).AsBitmap(),
+            rb.GetImageNamed(IDR_CLOSE_1_MASK).AsBitmap());
       }
     }
   } else {
     close_button_bounds_.SetRect(0, 0, 0, 0);
   }
 
   if (!mini() || width() >= kMiniTabRendererAsNormalTabWidth) {
     // Size the Title text to fill the remaining space.
     int title_left = favicon_bounds_.right() + kFaviconTitleSpacing;
     int title_top = kTopPadding;
@@ skipping 298 matching lines @@
     return 0;
   return (width() - kLeftPadding - kRightPadding) / gfx::kFaviconSize;
 }
 
 bool TabRendererGtk::ShouldShowCloseBox() const {
   // The selected tab never clips close button.
   return !mini() && (IsActive() || IconCapacity() >= 3);
 }
 
 CustomDrawButton* TabRendererGtk::MakeCloseButton() {
-  CustomDrawButton* button = new CustomDrawButton(IDR_TAB_CLOSE,
-      IDR_TAB_CLOSE_P, IDR_TAB_CLOSE_H, IDR_TAB_CLOSE);
+  CustomDrawButton* button = CustomDrawButton::CloseButtonBar(theme_service_);
   button->ForceChromeTheme();
 
   g_signal_connect(button->widget(), "clicked",
                    G_CALLBACK(OnCloseButtonClickedThunk), this);
   g_signal_connect(button->widget(), "button-release-event",
                    G_CALLBACK(OnCloseButtonMouseReleaseThunk), this);
   g_signal_connect(button->widget(), "enter-notify-event",
                    G_CALLBACK(OnEnterNotifyEventThunk), this);
   g_signal_connect(button->widget(), "leave-notify-event",
                    G_CALLBACK(OnLeaveNotifyEventThunk), this);
@@ skipping 84 matching lines @@
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   GdkPixbuf* tab_active_l = rb.GetNativeImageNamed(
       IDR_TAB_ACTIVE_LEFT).ToGdkPixbuf();
   tab_active_l_width_ = gdk_pixbuf_get_width(tab_active_l);
   tab_active_l_height_ = gdk_pixbuf_get_height(tab_active_l);
 
   GdkPixbuf* tab_inactive_l = rb.GetNativeImageNamed(
       IDR_TAB_INACTIVE_LEFT).ToGdkPixbuf();
   tab_inactive_l_height_ = gdk_pixbuf_get_height(tab_inactive_l);
 
-  GdkPixbuf* tab_close = rb.GetNativeImageNamed(IDR_TAB_CLOSE).ToGdkPixbuf();
+  GdkPixbuf* tab_close = rb.GetNativeImageNamed(IDR_CLOSE_1).ToGdkPixbuf();
   close_button_width_ = gdk_pixbuf_get_width(tab_close);
   close_button_height_ = gdk_pixbuf_get_height(tab_close);
 
   const gfx::Font& base_font = rb.GetFont(ui::ResourceBundle::BaseFont);
   title_font_ = new gfx::Font(base_font.GetFontName(), kFontPixelSize);
   title_font_height_ = title_font_->GetHeight();
 
   initialized_ = true;
 }