fix gtk find bar

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 43 matching lines @@
 // label for failure searches.
 const GdkColor& kEntryTextColor = ui::kGdkBlack;
 
 // Used as the color of the background of the entry box and the background of
 // the find label for successful searches.
 const GdkColor& kEntryBackgroundColor = ui::kGdkWhite;
 const GdkColor kFindFailureBackgroundColor = GDK_COLOR_RGB(255, 102, 102);
 const GdkColor kFindSuccessTextColor = GDK_COLOR_RGB(178, 178, 178);
 
 // Padding around the container.
-const int kBarPaddingTopBottom = 4;
+const int kBarPaddingTop = 2;
+const int kBarPaddingBottom = 3;
 const int kEntryPaddingLeft = 6;
-const int kCloseButtonPaddingLeft = 3;
+const int kCloseButtonPadding = 3;
 const int kBarPaddingRight = 4;
 
 // The height of the findbar dialog, as dictated by the size of the background
 // images.
 const int kFindBarHeight = 32;
 
 // The default width of the findbar dialog. It may get smaller if the window
 // is narrow.
 const int kFindBarWidth = 303;
 
@@ skipping 145 matching lines @@
 
 void FindBarGtk::InitWidgets() {
   // The find bar is basically an hbox with a gtkentry (text box) followed by 3
   // buttons (previous result, next result, close).  We wrap the hbox in a gtk
   // alignment and a gtk event box to get the padding and light blue
   // background. We put that event box in a fixed in order to control its
   // lateral position. We put that fixed in a SlideAnimatorGtk in order to get
   // the slide effect.
   GtkWidget* hbox = gtk_hbox_new(false, 0);
   container_ = gtk_util::CreateGtkBorderBin(hbox, NULL,
-      kBarPaddingTopBottom, kBarPaddingTopBottom,
+      kBarPaddingTop, kBarPaddingBottom,
       kEntryPaddingLeft, kBarPaddingRight);
-  gtk_widget_set_size_request(container_, kFindBarWidth, -1);
+  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));
 
-  close_button_.reset(CustomDrawButton::CloseButton(theme_service_));
-  gtk_util::CenterWidgetInHBox(hbox, close_button_->widget(), true,
-                               kCloseButtonPaddingLeft);
+  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));
+  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,
       IDR_FINDINPAGE_NEXT_D, GTK_STOCK_GO_DOWN, GTK_ICON_SIZE_MENU));
   g_signal_connect(find_next_button_->widget(), "clicked",
                    G_CALLBACK(OnClickedThunk), this);
@@ skipping 275 matching lines @@
                               2, 2, 3, 0);
 
     // We need this event box to be invisible because we're only going to draw
     // on the background (but we can't take it out of the heiarchy entirely
     // 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(ThemeService::COLOR_TAB_TEXT),
-        rb.GetImageNamed(IDR_CLOSE_BAR).AsBitmap(),
-        rb.GetImageNamed(IDR_CLOSE_BAR_MASK).AsBitmap());
+        rb.GetImageNamed(IDR_TAB_CLOSE).AsBitmap(),
+        rb.GetImageNamed(IDR_TAB_CLOSE).AsBitmap());
   }
 
   UpdateMatchLabelAppearance(match_label_failure_);
 }
 
 bool FindBarGtk::GetFindBarWindowInfo(gfx::Point* position,
                                       bool* fully_visible) {
   if (position)
     *position = GetPosition();
 
@@ skipping 455 matching lines @@
   return FALSE;  // Continue propagation.
 }
 
 gboolean FindBarGtk::OnFocusOut(GtkWidget* entry, GdkEventFocus* event) {
   g_signal_handlers_disconnect_by_func(
       gdk_keymap_get_for_display(gtk_widget_get_display(entry)),
       reinterpret_cast<gpointer>(&OnKeymapDirectionChanged), this);
 
   return FALSE;  // Continue propagation.
 }