GTK: More transitions to thunk definition macros.

chrome/browser/tab_contents/tab_contents_view_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_TAB_CONTENTS_TAB_CONTENTS_VIEW_GTK_H_
 #define CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_VIEW_GTK_H_
 
 #include <gtk/gtk.h>
 
+#include "app/gtk_signal.h"
 #include "base/scoped_ptr.h"
 #include "chrome/browser/gtk/focus_store_gtk.h"
 #include "chrome/browser/tab_contents/tab_contents_view.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
 #include "chrome/common/owned_widget_gtk.h"
 
 class ConstrainedWindowGtk;
 class GtkThemeProperties;
 class RenderViewContextMenuGtk;
@@ skipping 51 matching lines @@
  private:
   // Insert the given widget into the content area. Should only be used for
   // web pages and the like (including interstitials and sad tab). Note that
   // this will be perfectly happy to insert overlapping render views, so care
   // should be taken that the correct one is hidden/shown.
   void InsertIntoContentArea(GtkWidget* widget);
 
   void CancelDragIfAny();
 
   // We keep track of the timestamp of the latest mousedown event.
-  static gboolean OnMouseDown(GtkWidget* widget,
-                              GdkEventButton* event, TabContentsViewGtk* view);
+  CHROMEGTK_CALLBACK_1(TabContentsViewGtk, gboolean, OnMouseDown,
+                       GdkEventButton*);
 
   // Used to adjust the size of its children when the size of |expanded_| is
   // changed.
-  static void OnChildSizeRequest(GtkWidget* widget,
-                                 GtkWidget* child,
-                                 GtkRequisition* requisition,
-                                 TabContentsViewGtk* view);
+  CHROMEGTK_CALLBACK_2(TabContentsViewGtk, void, OnChildSizeRequest,
+                       GtkWidget*, GtkRequisition*);
 
   // Used to propagate the size change of |expanded_| to our RWHV to resize the
   // renderer content.
-  static void OnSizeAllocate(GtkWidget* widget,
-                             GtkAllocation* allocation,
-                             TabContentsViewGtk* view);
+  CHROMEGTK_CALLBACK_1(TabContentsViewGtk, void, OnSizeAllocate,
+                       GtkAllocation*);
 
-  static void OnSetFloatingPosition(
-      GtkFloatingContainer* floating_container, GtkAllocation* allocation,
-      TabContentsViewGtk* tab_contents_view);
+  CHROMEGTK_CALLBACK_1(TabContentsViewGtk, void, OnSetFloatingPosition,
+                       GtkAllocation*);
 
   // Contains |expanded_| as its GtkBin member.
   OwnedWidgetGtk floating_;
 
   // This container holds the tab's web page views. It is a GtkExpandedContainer
   // so that we can control the size of the web pages.
   GtkWidget* expanded_;
 
   // The context menu is reset every time we show it, but we keep a pointer to
   // between uses so that it won't go out of scope before we're done with it.
@@ skipping 22 matching lines @@
   scoped_ptr<TabContentsDragSource> drag_source_;
 
   // The size we want the tab contents view to be.  We keep this in a separate
   // variable because resizing in GTK+ is async.
   gfx::Size requested_size_;
 
   DISALLOW_COPY_AND_ASSIGN(TabContentsViewGtk);
 };
 
 #endif  // CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_VIEW_GTK_H_