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

chrome/browser/ui/gtk/find_bar_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/find_bar_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 
 #include <algorithm>
 #include <string>
@@ skipping 230 matching lines @@
       kEntryPaddingLeft, kBarPaddingRight);
   gtk_widget_set_size_request(container_, kFindBarWidth, kFindBarHeight);
   ViewIDUtil::SetID(container_, VIEW_ID_FIND_IN_PAGE);
   gtk_widget_set_app_paintable(container_, TRUE);
 
   slide_widget_.reset(new SlideAnimatorGtk(container_,
                                            SlideAnimatorGtk::DOWN,
                                            0, false, true, NULL));
 
   GtkWidget* close_alignment = gtk_alignment_new(0, 0.6, 1, 0);
-  close_button_.reset(new CustomDrawButton(
-      theme_service_, IDR_TAB_CLOSE,
-      IDR_TAB_CLOSE_P, IDR_TAB_CLOSE_H, IDR_TAB_CLOSE,
-      GTK_STOCK_CLOSE, GTK_ICON_SIZE_MENU));
+  close_button_.reset(CustomDrawButton::CloseButtonBar(theme_service_));
   gtk_container_add(GTK_CONTAINER(close_alignment), close_button_->widget());
   gtk_box_pack_end(GTK_BOX(hbox), close_alignment, FALSE, FALSE,
                    kCloseButtonPadding);
   g_signal_connect(close_button_->widget(), "clicked",
                    G_CALLBACK(OnClickedThunk), this);
   gtk_widget_set_tooltip_text(close_button_->widget(),
       l10n_util::GetStringUTF8(IDS_FIND_IN_PAGE_CLOSE_TOOLTIP).c_str());
 
   find_next_button_.reset(new CustomDrawButton(theme_service_,
       IDR_FINDINPAGE_NEXT, IDR_FINDINPAGE_NEXT_H, IDR_FINDINPAGE_NEXT_H,
@@ skipping 289 matching lines @@
     // because we also need it to take up space).
     gtk_event_box_set_visible_window(GTK_EVENT_BOX(border_bin_), FALSE);
     gtk_widget_set_app_paintable(border_bin_, FALSE);
 
     gtk_misc_set_alignment(GTK_MISC(match_count_label_), 0.5, 1.0);
 
     // This is necessary to make the close button dark enough.
     ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
     close_button_->SetBackground(
         theme_service_->GetColor(ThemeProperties::COLOR_TAB_TEXT),
-        rb.GetImageNamed(IDR_TAB_CLOSE).AsBitmap(),
-        rb.GetImageNamed(IDR_TAB_CLOSE).AsBitmap());
+        rb.GetImageNamed(IDR_CLOSE_1).AsBitmap(),
+        rb.GetImageNamed(IDR_CLOSE_1).AsBitmap());
   }
 
   UpdateMatchLabelAppearance(match_label_failure_);
 }
 
 bool FindBarGtk::GetFindBarWindowInfo(gfx::Point* position,
                                       bool* fully_visible) {
   if (position)
     *position = GetPosition();
 
@@ skipping 472 matching lines @@
   ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread();
   string16 text;
   clipboard->ReadText(ui::Clipboard::BUFFER_STANDARD, &text);
 
   // Overwrite clipboard with the correct source tag.
   ui::ScopedClipboardWriter scw(clipboard,
                                 ui::Clipboard::BUFFER_STANDARD,
                                 source_tag);
   scw.WriteText(text);
 }