gtk: Convert OnFocusIn and OnFocusOut to CHROMEGTK macro in FindBarGtk.

chrome/browser/ui/gtk/find_bar_gtk.cc

 // Copyright (c) 2011 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 188 matching lines @@
   g_signal_connect(text_entry_, "focus",
                    G_CALLBACK(OnFocus), this);
   gtk_widget_add_events(text_entry_, GDK_BUTTON_PRESS_MASK);
   g_signal_connect(text_entry_, "button-press-event",
                    G_CALLBACK(OnButtonPress), this);
   g_signal_connect(text_entry_, "move-cursor", G_CALLBACK(OnMoveCursor), this);
   g_signal_connect(text_entry_, "activate", G_CALLBACK(OnActivateThunk), this);
   g_signal_connect(text_entry_, "direction-changed",
                    G_CALLBACK(OnWidgetDirectionChanged), this);
   g_signal_connect(text_entry_, "focus-in-event",
-                   G_CALLBACK(OnFocusIn), this);
+                   G_CALLBACK(OnFocusInThunk), this);
   g_signal_connect(text_entry_, "focus-out-event",
-                   G_CALLBACK(OnFocusOut), this);
+                   G_CALLBACK(OnFocusOutThunk), this);
   g_signal_connect(container_, "expose-event",
                    G_CALLBACK(OnExpose), this);
 }
 
 FindBarGtk::~FindBarGtk() {
 }
 
 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
@@ skipping 503 matching lines @@
 void FindBarGtk::OnParentSet(GtkWidget* widget, GtkObject* old_parent,
                              FindBarGtk* find_bar) {
   if (!widget->parent)
     return;
 
   g_signal_connect(widget->parent, "set-floating-position",
                    G_CALLBACK(OnSetFloatingPosition), find_bar);
 }
 
 // static
-void FindBarGtk::OnSetFloatingPosition(
-    GtkFloatingContainer* floating_container,
-    GtkAllocation* allocation,
-    FindBarGtk* find_bar) {
+void FindBarGtk::OnSetFloatingPosition(GtkFloatingContainer* floating_container,
+                                       GtkAllocation* allocation,
+                                       FindBarGtk* find_bar) {
   GtkWidget* findbar = find_bar->widget();
 
   int xposition = find_bar->GetDialogPosition(find_bar->selection_rect_).x();
 
   GValue value = { 0, };
   g_value_init(&value, G_TYPE_INT);
   g_value_set_int(&value, xposition);
   gtk_container_child_set_property(GTK_CONTAINER(floating_container),
                                    findbar, "x", &value);
 
@@ skipping 207 matching lines @@
     }
 
     gdk_event_free(event);
   }
 }
 
 void FindBarGtk::OnActivate(GtkWidget* entry) {
   FindEntryTextInContents(true);
 }
 
-// static
-gboolean FindBarGtk::OnFocusIn(GtkWidget* entry, GdkEventFocus* event,
-                               FindBarGtk* find_bar) {
-  g_signal_connect(
-      gdk_keymap_get_for_display(gtk_widget_get_display(entry)),
-      "direction-changed",
-      G_CALLBACK(&OnKeymapDirectionChanged), find_bar);
+gboolean FindBarGtk::OnFocusIn(GtkWidget* entry, GdkEventFocus* event) {
+  g_signal_connect(gdk_keymap_get_for_display(gtk_widget_get_display(entry)),
+                   "direction-changed",
+                   G_CALLBACK(&OnKeymapDirectionChanged), this);
 
-  find_bar->AdjustTextAlignment();
+  AdjustTextAlignment();
 
   return FALSE;  // Continue propagation.
 }
 
-// static
-gboolean FindBarGtk::OnFocusOut(GtkWidget* entry, GdkEventFocus* event,
-                                FindBarGtk* find_bar) {
+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), find_bar);
+      reinterpret_cast<gpointer>(&OnKeymapDirectionChanged), this);
 
   return FALSE;  // Continue propagation.
 }