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

chrome/browser/gtk/hover_controller_gtk.h

 // Copyright (c) 2010 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.
 
 #ifndef CHROME_BROWSER_GTK_HOVER_CONTROLLER_GTK_H_
 #define CHROME_BROWSER_GTK_HOVER_CONTROLLER_GTK_H_
 
 #include <gtk/gtk.h>
 
+#include "app/gtk_signal.h"
 #include "app/slide_animation.h"
 #include "app/throb_animation.h"
 #include "base/scoped_ptr.h"
 
 // This class handles the "throbbing" of a GtkChromeButton. The visual effect
 // of throbbing is created by painting partially transparent hover effects. It
 // only works in non-gtk theme mode. This class mainly exists to glue an
 // AnimationDelegate (C++ class) to a GtkChromeButton* (GTK/c object).
 class HoverControllerGtk : public AnimationDelegate {
  public:
@@ skipping 17 matching lines @@
   void Destroy();
 
  private:
   explicit HoverControllerGtk(GtkWidget* button);
 
   // Overridden from AnimationDelegate.
   virtual void AnimationProgressed(const Animation* animation);
   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);
 };
 
 #endif  // CHROME_BROWSER_GTK_HOVER_CONTROLLER_GTK_H_