Revert: r41458 | estade@chromium.org | 2010-03-12 11:28:50 -0800 (Fri, 12 Mar 2010) | 8 lines

Fix the rest of the gtk/options directory to use new callback macros.

Problematically, the callback macros don't cover the case where the GObject* isn't a GtkWidget* D:

BUG=None
TEST=compile

it's breaking unit tests


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

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

1 files changed, 17 insertions, 10 deletions

diff --git a/chrome/browser/gtk/options/passwords_page_gtk.h b/chrome/browser/gtk/options/passwords_page_gtk.h
index 9cf8e38..891f36b 100644
--- a/chrome/browser/gtk/options/passwords_page_gtk.h
+++ b/chrome/browser/gtk/options/passwords_page_gtk.h
@@ -9,7 +9,6 @@
 
 #include <vector>
 
-#include "app/gtk_signal.h"
 #include "chrome/browser/password_manager/password_store.h"
 #include "chrome/browser/profile.h"
 
@@ -32,16 +31,24 @@ class PasswordsPageGtk {
   // Sets the password list contents to the given data.
   void SetPasswordList(const std::vector<webkit_glue::PasswordForm*>& result);
 
-  CHROMEGTK_CALLBACK_0(PasswordsPageGtk, void, OnRemoveButtonClicked);
-  CHROMEGTK_CALLBACK_0(PasswordsPageGtk, void, OnRemoveAllButtonClicked);
-  CHROMEGTK_CALLBACK_1(PasswordsPageGtk, void, OnRemoveAllConfirmResponse, int);
-  CHROMEGTK_CALLBACK_0(PasswordsPageGtk, void, OnShowPasswordButtonClicked);
+  // Callback for the remove button.
+  static void OnRemoveButtonClicked(GtkButton* widget, PasswordsPageGtk* page);
 
-  static void OnPasswordSelectionChangedThunk(GtkTreeSelection* selection,
-                                              PasswordsPageGtk* page) {
-    page->OnPasswordSelectionChanged(selection);
-  }
-  void OnPasswordSelectionChanged(GtkTreeSelection* selection);
+  // Callback for the remove all button.
+  static void OnRemoveAllButtonClicked(GtkButton* widget,
+                                       PasswordsPageGtk* page);
+
+  // Callback for the remove all confirmation response.
+  static void OnRemoveAllConfirmResponse(GtkDialog* confirm, gint response,
+                                         PasswordsPageGtk* page);
+
+  // Callback for the show password button.
+  static void OnShowPasswordButtonClicked(GtkButton* widget,
+                                          PasswordsPageGtk* page);
+
+  // Callback for selection changed events.
+  static void OnPasswordSelectionChanged(GtkTreeSelection* selection,
+                                         PasswordsPageGtk* page);
 
   // Sorting functions.
   static gint CompareSite(GtkTreeModel* model,