GTK: make more use of gtk_signal convenience macros/signal registrar.

BUG=none
TEST=none

Review URL: http://codereview.chromium.org/1708013

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45850 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 8 insertions, 19 deletions

diff --git a/chrome/browser/gtk/hover_controller_gtk.h b/chrome/browser/gtk/hover_controller_gtk.h
index 6867503..10196ad 100644
--- a/chrome/browser/gtk/hover_controller_gtk.h
+++ b/chrome/browser/gtk/hover_controller_gtk.h
@@ -7,6 +7,7 @@
 
 #include <gtk/gtk.h>
 
+#include "app/gtk_signal.h"
 #include "app/slide_animation.h"
 #include "app/throb_animation.h"
 #include "base/scoped_ptr.h"
@@ -44,30 +45,18 @@ class HoverControllerGtk : public AnimationDelegate {
   virtual void AnimationEnded(const Animation* animation);
   virtual void AnimationCanceled(const Animation* animation);
 
-  static gboolean OnEnterThunk(GtkWidget* widget,
-                               GdkEventCrossing* event,
-                               HoverControllerGtk* hover_controller) {
-    return hover_controller->OnEnter(widget, event);
-  }
-  gboolean OnEnter(GtkWidget* widget, GdkEventCrossing* event);
-
-  static gboolean OnLeaveThunk(GtkWidget* widget,
-                               GdkEventCrossing* event,
-                               HoverControllerGtk* hover_controller) {
-    return hover_controller->OnLeave(widget, event);
-  }
-  gboolean OnLeave(GtkWidget* widget, GdkEventCrossing* event);
-
-  static void OnButtonDestroyThunk(GtkWidget* widget,
-                                   HoverControllerGtk* hover_controller) {
-    hover_controller->OnButtonDestroy(widget);
-  }
-  void OnButtonDestroy(GtkWidget* widget);
+  CHROMEGTK_CALLBACK_1(HoverControllerGtk, gboolean, OnEnter,
+                       GdkEventCrossing*);
+  CHROMEGTK_CALLBACK_1(HoverControllerGtk, gboolean, OnLeave,
+                       GdkEventCrossing*);
+  CHROMEGTK_CALLBACK_0(HoverControllerGtk, void, OnDestroy);
 
   ThrobAnimation throb_animation_;
   SlideAnimation hover_animation_;
   GtkWidget* button_;
 
+  GtkSignalRegistrar signals_;
+
   DISALLOW_COPY_AND_ASSIGN(HoverControllerGtk);
 };