gtk: Make use of gtk signal macros in EditSearchEngineDialog.

BUG=None
TEST=manually

Patch from Thiago Farina <thiago.farina@gmail.com>

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

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

2 files changed, 20 insertions, 27 deletions

diff --git a/chrome/browser/gtk/edit_search_engine_dialog.cc b/chrome/browser/gtk/edit_search_engine_dialog.cc
index 45898ea..0359595 100644
--- a/chrome/browser/gtk/edit_search_engine_dialog.cc
+++ b/chrome/browser/gtk/edit_search_engine_dialog.cc
@@ -111,7 +111,7 @@ void EditSearchEngineDialog::Init(GtkWindow* parent_window, Profile* profile) {
   title_entry_ = gtk_entry_new();
   gtk_entry_set_activates_default(GTK_ENTRY(title_entry_), TRUE);
   g_signal_connect(title_entry_, "changed",
-                   G_CALLBACK(OnEntryChanged), this);
+                   G_CALLBACK(OnEntryChangedThunk), this);
   accessible_widget_helper_->SetWidgetName(
       title_entry_,
       IDS_SEARCH_ENGINES_EDITOR_DESCRIPTION_LABEL);
@@ -119,7 +119,7 @@ void EditSearchEngineDialog::Init(GtkWindow* parent_window, Profile* profile) {
   keyword_entry_ = gtk_entry_new();
   gtk_entry_set_activates_default(GTK_ENTRY(keyword_entry_), TRUE);
   g_signal_connect(keyword_entry_, "changed",
-                   G_CALLBACK(OnEntryChanged), this);
+                   G_CALLBACK(OnEntryChangedThunk), this);
   g_signal_connect(keyword_entry_, "insert-text",
                    G_CALLBACK(LowercaseInsertTextHandler), NULL);
   accessible_widget_helper_->SetWidgetName(
@@ -129,7 +129,7 @@ void EditSearchEngineDialog::Init(GtkWindow* parent_window, Profile* profile) {
   url_entry_ = gtk_entry_new();
   gtk_entry_set_activates_default(GTK_ENTRY(url_entry_), TRUE);
   g_signal_connect(url_entry_, "changed",
-                   G_CALLBACK(OnEntryChanged), this);
+                   G_CALLBACK(OnEntryChangedThunk), this);
   accessible_widget_helper_->SetWidgetName(
       url_entry_,
       IDS_SEARCH_ENGINES_EDITOR_URL_LABEL);
@@ -198,8 +198,8 @@ void EditSearchEngineDialog::Init(GtkWindow* parent_window, Profile* profile) {
 
   gtk_widget_show_all(dialog_);
 
-  g_signal_connect(dialog_, "response", G_CALLBACK(OnResponse), this);
-  g_signal_connect(dialog_, "destroy", G_CALLBACK(OnWindowDestroy), this);
+  g_signal_connect(dialog_, "response", G_CALLBACK(OnResponseThunk), this);
+  g_signal_connect(dialog_, "destroy", G_CALLBACK(OnWindowDestroyThunk), this);
 }
 
 std::wstring EditSearchEngineDialog::GetTitleInput() const {
@@ -244,27 +244,21 @@ void EditSearchEngineDialog::UpdateImage(GtkWidget* image,
   }
 }
 
-// static
-void EditSearchEngineDialog::OnEntryChanged(
-    GtkEditable* editable, EditSearchEngineDialog* window) {
-  window->EnableControls();
+void EditSearchEngineDialog::OnEntryChanged(GtkEditable* editable) {
+  EnableControls();
 }
 
-// static
-void EditSearchEngineDialog::OnResponse(GtkDialog* dialog, int response_id,
-                                        EditSearchEngineDialog* window) {
+void EditSearchEngineDialog::OnResponse(GtkDialog* dialog, int response_id) {
   if (response_id == GTK_RESPONSE_OK) {
-    window->controller_->AcceptAddOrEdit(window->GetTitleInput(),
-                                         window->GetKeywordInput(),
-                                         window->GetURLInput());
+    controller_->AcceptAddOrEdit(GetTitleInput(),
+                                 GetKeywordInput(),
+                                 GetURLInput());
   } else {
-    window->controller_->CleanUpCancelledAdd();
+    controller_->CleanUpCancelledAdd();
   }
-  gtk_widget_destroy(window->dialog_);
+  gtk_widget_destroy(dialog_);
 }
 
-// static
-void EditSearchEngineDialog::OnWindowDestroy(
-    GtkWidget* widget, EditSearchEngineDialog* window) {
-  MessageLoop::current()->DeleteSoon(FROM_HERE, window);
+void EditSearchEngineDialog::OnWindowDestroy(GtkWidget* widget) {
+  MessageLoop::current()->DeleteSoon(FROM_HERE, this);
 }
diff --git a/chrome/browser/gtk/edit_search_engine_dialog.h b/chrome/browser/gtk/edit_search_engine_dialog.h
index 790a94d..1793671 100644
--- a/chrome/browser/gtk/edit_search_engine_dialog.h
+++ b/chrome/browser/gtk/edit_search_engine_dialog.h
@@ -8,6 +8,7 @@
 #include <gtk/gtk.h>
 #include <string>
 
+#include "app/gtk_signal.h"
 #include "base/basictypes.h"
 #include "base/scoped_ptr.h"
 
@@ -42,16 +43,14 @@ class EditSearchEngineDialog {
   void UpdateImage(GtkWidget* image, bool is_valid, int invalid_message_id);
 
   // Callback for entry changes.
-  static void OnEntryChanged(GtkEditable* editable,
-                             EditSearchEngineDialog* window);
+  CHROMEG_CALLBACK_0(EditSearchEngineDialog, void, OnEntryChanged,
+                     GtkEditable*);
 
   // Callback for dialog buttons.
-  static void OnResponse(GtkDialog* dialog, int response_id,
-                         EditSearchEngineDialog* window);
+  CHROMEG_CALLBACK_1(EditSearchEngineDialog, void, OnResponse, GtkDialog*, int);
 
   // Callback for window destruction.
-  static void OnWindowDestroy(GtkWidget* widget,
-                              EditSearchEngineDialog* window);
+  CHROMEGTK_CALLBACK_0(EditSearchEngineDialog, void, OnWindowDestroy);
 
   // The dialog window.
   GtkWidget* dialog_;