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

chrome/browser/ui/gtk/download/download_shelf_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/download/download_shelf_gtk.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "chrome/browser/download/download_item_model.h"
@@ skipping 102 matching lines @@
   GtkWidget* vbox = gtk_vbox_new(FALSE, 0);
   gtk_box_pack_start(GTK_BOX(vbox), top_border_, FALSE, FALSE, 0);
   gtk_box_pack_start(GTK_BOX(vbox), padding_bg_, FALSE, FALSE, 0);
 
   // Put the shelf in an event box so it gets its own window, which makes it
   // easier to get z-ordering right.
   shelf_.Own(gtk_event_box_new());
   gtk_container_add(GTK_CONTAINER(shelf_.get()), vbox);
 
   // Create and pack the close button.
-  close_button_.reset(CustomDrawButton::CloseButton(theme_service_));
+  close_button_.reset(CustomDrawButton::CloseButtonBar(theme_service_));
   gtk_util::CenterWidgetInHBox(outer_hbox, close_button_->widget(), true, 0);
   g_signal_connect(close_button_->widget(), "clicked",
                    G_CALLBACK(OnButtonClickThunk), this);
 
   // Create the "Show all downloads..." link and connect to the click event.
   link_button_ = theme_service_->BuildChromeLinkButton(
       l10n_util::GetStringUTF8(IDS_SHOW_ALL_DOWNLOADS));
   g_signal_connect(link_button_, "clicked",
                    G_CALLBACK(OnButtonClickThunk), this);
   gtk_util::SetButtonTriggersNavigation(link_button_);
@@ skipping 127 matching lines @@
             ThemeProperties::COLOR_BOOKMARK_TEXT);
     GdkColor bookmark_color = theme_service_->GetGdkColor(
         ThemeProperties::COLOR_BOOKMARK_TEXT);
     gtk_chrome_link_button_set_normal_color(
         GTK_CHROME_LINK_BUTTON(link_button_),
         use_default_color ? NULL : &bookmark_color);
 
     ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
     close_button_->SetBackground(
         theme_service_->GetColor(ThemeProperties::COLOR_TAB_TEXT),
-        rb.GetImageNamed(IDR_CLOSE_BAR).AsBitmap(),
-        rb.GetImageNamed(IDR_CLOSE_BAR_MASK).AsBitmap());
+        rb.GetImageNamed(IDR_CLOSE_1).AsBitmap(),
+        rb.GetImageNamed(IDR_CLOSE_1_MASK).AsBitmap());
   }
 }
 
 int DownloadShelfGtk::GetHeight() const {
   GtkAllocation allocation;
   gtk_widget_get_allocation(slide_widget_->widget(), &allocation);
   return allocation.height;
 }
 
 void DownloadShelfGtk::RemoveDownloadItem(DownloadItemGtk* download_item) {
@@ skipping 113 matching lines @@
 
   MessageLoop::current()->PostDelayedTask(
       FROM_HERE,
       base::Bind(&DownloadShelfGtk::Close, weak_factory_.GetWeakPtr()),
       base::TimeDelta::FromMilliseconds(kAutoCloseDelayMs));
 }
 
 void DownloadShelfGtk::MouseEnteredShelf() {
   weak_factory_.InvalidateWeakPtrs();
 }