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, 38 insertions, 14 deletions

diff --git a/chrome/browser/gtk/options/general_page_gtk.h b/chrome/browser/gtk/options/general_page_gtk.h
index b1f767c..fcb87b2 100644
--- a/chrome/browser/gtk/options/general_page_gtk.h
+++ b/chrome/browser/gtk/options/general_page_gtk.h
@@ -10,7 +10,6 @@
 #include <string>
 #include <vector>
 
-#include "app/gtk_signal.h"
 #include "chrome/browser/cancelable_request.h"
 #include "chrome/browser/options_page_base.h"
 #include "chrome/browser/pref_member.h"
@@ -86,21 +85,46 @@ class GeneralPageGtk : public OptionsPageBase,
   // Sets the home page pref using the value in the entry box
   void SetHomepageFromEntry();
 
-  CHROMEGTK_CALLBACK_0(GeneralPageGtk, void, OnStartupRadioToggled);
-  CHROMEGTK_CALLBACK_0(GeneralPageGtk, void, OnStartupAddCustomPageClicked);
-  CHROMEGTK_CALLBACK_0(GeneralPageGtk, void, OnStartupRemoveCustomPageClicked);
-  CHROMEGTK_CALLBACK_0(GeneralPageGtk, void, OnStartupUseCurrentPageClicked);
-  CHROMEGTK_CALLBACK_0(GeneralPageGtk, void, OnNewTabIsHomePageToggled);
-  CHROMEGTK_CALLBACK_0(GeneralPageGtk, void, OnHomepageUseUrlEntryChanged);
-  CHROMEGTK_CALLBACK_0(GeneralPageGtk, void, OnShowHomeButtonToggled);
-  CHROMEGTK_CALLBACK_0(GeneralPageGtk, void, OnDefaultSearchEngineChanged);
-  CHROMEGTK_CALLBACK_0(GeneralPageGtk, void,
-                       OnDefaultSearchManageEnginesClicked);
-  CHROMEGTK_CALLBACK_0(GeneralPageGtk, void, OnBrowserUseAsDefaultClicked);
-
-  static void OnStartupPagesSelectionChanged(GtkTreeSelection* selection,
+  // Callback for startup radio buttons
+  static void OnStartupRadioToggled(GtkToggleButton* toggle_button,
+                                    GeneralPageGtk* general_page);
+
+  // Callbacks for custom url list buttons
+  static void OnStartupAddCustomPageClicked(GtkButton* button,
+                                            GeneralPageGtk* general_page);
+  static void OnStartupRemoveCustomPageClicked(GtkButton* button,
+                                               GeneralPageGtk* general_page);
+  static void OnStartupUseCurrentPageClicked(GtkButton* button,
+                                             GeneralPageGtk* general_page);
+
+  // Callback for user selecting rows in custom pages list
+  static void OnStartupPagesSelectionChanged(GtkTreeSelection *selection,
                                              GeneralPageGtk* general_page);
 
+  // Callback for new tab behavior radio buttons
+  static void OnNewTabIsHomePageToggled(GtkToggleButton* toggle_button,
+                                        GeneralPageGtk* general_page);
+
+  // Callback for homepage URL entry
+  static void OnHomepageUseUrlEntryChanged(GtkEditable* editable,
+                                           GeneralPageGtk* general_page);
+
+  // Callback for Show Home Button option
+  static void OnShowHomeButtonToggled(GtkToggleButton* toggle_button,
+                                      GeneralPageGtk* general_page);
+
+  // Callback for default search engine selection
+  static void OnDefaultSearchEngineChanged(GtkComboBox* combo_box,
+                                           GeneralPageGtk* general_page);
+
+  // Callback for manage search engines button
+  static void OnDefaultSearchManageEnginesClicked(GtkButton* button,
+                                                  GeneralPageGtk* general_page);
+
+  // Callback for use as default browser button
+  static void OnBrowserUseAsDefaultClicked(GtkButton* button,
+                                           GeneralPageGtk* general_page);
+
   // Enables/Disables the controls associated with the custom start pages
   // option if that preference is not selected.
   void EnableCustomHomepagesControls(bool enable);