| Index: chrome/browser/gtk/tabs/tab_renderer_gtk.h
|
| diff --git a/chrome/browser/gtk/tabs/tab_renderer_gtk.h b/chrome/browser/gtk/tabs/tab_renderer_gtk.h
|
| index 912b3297aa80df1ba8ef28026a3155b3b22ccf91..e666506fd818eb1709f43f3d661f86639237b4e9 100644
|
| --- a/chrome/browser/gtk/tabs/tab_renderer_gtk.h
|
| +++ b/chrome/browser/gtk/tabs/tab_renderer_gtk.h
|
| @@ -9,6 +9,7 @@
|
| #include <map>
|
|
|
| #include "app/animation.h"
|
| +#include "app/gtk_signal.h"
|
| #include "app/slide_animation.h"
|
| #include "base/basictypes.h"
|
| #include "base/string16.h"
|
| @@ -222,12 +223,12 @@ class TabRendererGtk : public AnimationDelegate,
|
| std::wstring GetTitle() const;
|
|
|
| // enter-notify-event handler that signals when the mouse enters the tab.
|
| - static gboolean OnEnterNotifyEvent(GtkWidget* widget, GdkEventCrossing* event,
|
| - TabRendererGtk* tab);
|
| + CHROMEGTK_CALLBACK_1(TabRendererGtk, gboolean, OnEnterNotifyEvent,
|
| + GdkEventCrossing*);
|
|
|
| // leave-notify-event handler that signals when the mouse enters the tab.
|
| - static gboolean OnLeaveNotifyEvent(GtkWidget* widget, GdkEventCrossing* event,
|
| - TabRendererGtk* tab);
|
| + CHROMEGTK_CALLBACK_1(TabRendererGtk, gboolean, OnLeaveNotifyEvent,
|
| + GdkEventCrossing*);
|
|
|
| private:
|
| class FavIconCrashAnimation;
|
| @@ -350,20 +351,18 @@ class TabRendererGtk : public AnimationDelegate,
|
| double GetThrobValue();
|
|
|
| // Handles the clicked signal for the close button.
|
| - static void OnCloseButtonClicked(GtkWidget* widget, TabRendererGtk* tab);
|
| + CHROMEGTK_CALLBACK_0(TabRendererGtk, void, OnCloseButtonClicked);
|
|
|
| // Handles middle clicking the close button.
|
| - static gboolean OnCloseButtonMouseRelease(GtkWidget* widget,
|
| - GdkEventButton* event,
|
| - TabRendererGtk* tab);
|
| + CHROMEGTK_CALLBACK_1(TabRendererGtk, gboolean, OnCloseButtonMouseRelease,
|
| + GdkEventButton*);
|
|
|
| // expose-event handler that redraws the tab.
|
| - static gboolean OnExposeEvent(GtkWidget* widget, GdkEventExpose* event,
|
| - TabRendererGtk* tab);
|
| + CHROMEGTK_CALLBACK_1(TabRendererGtk, gboolean, OnExposeEvent,
|
| + GdkEventExpose*);
|
|
|
| // size-allocate handler used to update the current bounds of the tab.
|
| - static void OnSizeAllocate(GtkWidget* widget, GtkAllocation* allocation,
|
| - TabRendererGtk* tab);
|
| + CHROMEGTK_CALLBACK_1(TabRendererGtk, void, OnSizeAllocate, GtkAllocation*);
|
|
|
| // TODO(jhawkins): Move to TabResources.
|
| static void InitResources();
|
|
|