Devirtualize CHROMEGTK_CALLBACK.

BUG=103827
TEST=compiles on clang without warnings and passes tests

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

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

2 files changed, 38 insertions, 11 deletions

diff --git a/ui/base/gtk/gtk_signal.h b/ui/base/gtk/gtk_signal.h
index 5a9a914..68c96bf 100644
--- a/ui/base/gtk/gtk_signal.h
+++ b/ui/base/gtk/gtk_signal.h
@@ -13,30 +13,57 @@ typedef struct _GtkWidget GtkWidget;
 // These macros handle the common case where the sender object will be a
 // GtkWidget*.
 #define CHROMEGTK_CALLBACK_0(CLASS, RETURN, METHOD) \
-  CHROMEG_VIRTUAL_CALLBACK_0(CLASS, RETURN, METHOD, GtkWidget*);
+  CHROMEG_CALLBACK_0(CLASS, RETURN, METHOD, GtkWidget*);
 
 #define CHROMEGTK_CALLBACK_1(CLASS, RETURN, METHOD, ARG1) \
-  CHROMEG_VIRTUAL_CALLBACK_1(CLASS, RETURN, METHOD, GtkWidget*, ARG1);
+  CHROMEG_CALLBACK_1(CLASS, RETURN, METHOD, GtkWidget*, ARG1);
 
 #define CHROMEGTK_CALLBACK_2(CLASS, RETURN, METHOD, ARG1, ARG2) \
-  CHROMEG_VIRTUAL_CALLBACK_2(CLASS, RETURN, METHOD, GtkWidget*, ARG1, ARG2);
+  CHROMEG_CALLBACK_2(CLASS, RETURN, METHOD, GtkWidget*, ARG1, ARG2);
 
 #define CHROMEGTK_CALLBACK_3(CLASS, RETURN, METHOD, ARG1, ARG2, ARG3) \
-  CHROMEG_VIRTUAL_CALLBACK_3(CLASS, RETURN, METHOD, GtkWidget*, ARG1, \
-                             ARG2, ARG3);
+  CHROMEG_CALLBACK_3(CLASS, RETURN, METHOD, GtkWidget*, ARG1, ARG2, ARG3);
 
 #define CHROMEGTK_CALLBACK_4(CLASS, RETURN, METHOD, ARG1, ARG2, ARG3, ARG4) \
-  CHROMEG_VIRTUAL_CALLBACK_4(CLASS, RETURN, METHOD, GtkWidget*, ARG1, ARG2, \
-                             ARG3, ARG4);
+  CHROMEG_CALLBACK_4(CLASS, RETURN, METHOD, GtkWidget*, ARG1, ARG2, ARG3,   \
+                     ARG4);
 
 #define CHROMEGTK_CALLBACK_5(CLASS, RETURN, METHOD, ARG1, ARG2, ARG3, ARG4, \
                              ARG5)                                          \
-  CHROMEG_VIRTUAL_CALLBACK_5(CLASS, RETURN, METHOD, GtkWidget*, ARG1, ARG2, \
-                             ARG3, ARG4, ARG5);
+  CHROMEG_CALLBACK_5(CLASS, RETURN, METHOD, GtkWidget*, ARG1, ARG2, ARG3,   \
+                     ARG4, ARG5);
 
 #define CHROMEGTK_CALLBACK_6(CLASS, RETURN, METHOD, ARG1, ARG2, ARG3, ARG4, \
                              ARG5, ARG6)                                    \
-  CHROMEG_VIRTUAL_CALLBACK_6(CLASS, RETURN, METHOD, GtkWidget*, ARG1, ARG2, \
+  CHROMEG_CALLBACK_6(CLASS, RETURN, METHOD, GtkWidget*, ARG1, ARG2, ARG3,   \
+                     ARG4, ARG5, ARG6);
+
+#define CHROMEGTK_VIRTUAL_CALLBACK_0(CLASS, RETURN, METHOD) \
+  CHROMEG_VIRTUAL_CALLBACK_0(CLASS, RETURN, METHOD, GtkWidget*);
+
+#define CHROMEGTK_VIRTUAL_CALLBACK_1(CLASS, RETURN, METHOD, ARG1) \
+  CHROMEG_VIRTUAL_CALLBACK_1(CLASS, RETURN, METHOD, GtkWidget*, ARG1);
+
+#define CHROMEGTK_VIRTUAL_CALLBACK_2(CLASS, RETURN, METHOD, ARG1, ARG2) \
+  CHROMEG_VIRTUAL_CALLBACK_2(CLASS, RETURN, METHOD, GtkWidget*, ARG1, ARG2);
+
+#define CHROMEGTK_VIRTUAL_CALLBACK_3(CLASS, RETURN, METHOD, ARG1, ARG2, ARG3) \
+  CHROMEG_VIRTUAL_CALLBACK_3(CLASS, RETURN, METHOD, GtkWidget*, ARG1, ARG2,   \
+                             ARG3);
+
+#define CHROMEGTK_VIRTUAL_CALLBACK_4(CLASS, RETURN, METHOD, ARG1, ARG2, ARG3, \
+                                     ARG4) \
+  CHROMEG_VIRTUAL_CALLBACK_4(CLASS, RETURN, METHOD, GtkWidget*, ARG1, ARG2,   \
+                             ARG3, ARG4);
+
+#define CHROMEGTK_VIRTUAL_CALLBACK_5(CLASS, RETURN, METHOD, ARG1, ARG2, ARG3, \
+                                     ARG4, ARG5)                              \
+  CHROMEG_VIRTUAL_CALLBACK_5(CLASS, RETURN, METHOD, GtkWidget*, ARG1, ARG2,   \
+                             ARG3, ARG4, ARG5);
+
+#define CHROMEGTK_VIRTUAL_CALLBACK_6(CLASS, RETURN, METHOD, ARG1, ARG2, ARG3, \
+                                     ARG4, ARG5, ARG6)                        \
+  CHROMEG_VIRTUAL_CALLBACK_6(CLASS, RETURN, METHOD, GtkWidget*, ARG1, ARG2,   \
                              ARG3, ARG4, ARG5, ARG6);
 
 #endif  // UI_BASE_GTK_GTK_SIGNAL_H_
diff --git a/ui/base/gtk/tooltip_window_gtk.h b/ui/base/gtk/tooltip_window_gtk.h
index 8c908e0..8183fe9 100644
--- a/ui/base/gtk/tooltip_window_gtk.h
+++ b/ui/base/gtk/tooltip_window_gtk.h
@@ -26,7 +26,7 @@ namespace ui {
 class UI_EXPORT TooltipWindowGtk {
  public:
   explicit TooltipWindowGtk(GtkWidget* widget);
-  virtual ~TooltipWindowGtk();
+  ~TooltipWindowGtk();
 
   // Sets tooltip text to display.
   void SetTooltipText(const string16& text);