gtk: Cleanup JSModalDialogGtk implementation.

chrome/browser/gtk/js_modal_dialog_gtk.cc

 // 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.
 
 #include "chrome/browser/gtk/js_modal_dialog_gtk.h"
 
 #include <gtk/gtk.h>
 
 #include "app/l10n_util.h"
 #include "app/message_box_flags.h"
@@ skipping 117 matching lines @@
   } else {
     // Add the OK button and focus it.
     GtkWidget* ok_button = gtk_dialog_add_button(GTK_DIALOG(gtk_dialog_),
         GTK_STOCK_OK, GTK_RESPONSE_OK);
     if (MessageBoxFlags::kIsJavascriptPrompt != dialog_->dialog_flags())
       gtk_widget_grab_focus(ok_button);
   }
 
   gtk_dialog_set_default_response(GTK_DIALOG(gtk_dialog_), GTK_RESPONSE_OK);
   g_signal_connect(gtk_dialog_, "response",
-      G_CALLBACK(JSModalDialogGtk::OnDialogResponse),
-      reinterpret_cast<JSModalDialogGtk*>(this));
+                   G_CALLBACK(OnDialogResponseThunk), this);
 }
 
 JSModalDialogGtk::~JSModalDialogGtk() {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // JSModalDialogGtk, NativeAppModalDialog implementation:
 
 int JSModalDialogGtk::GetAppModalDialogButtons() const {
   switch (dialog_->dialog_flags()) {
@@ skipping 17 matching lines @@
   gtk_util::ShowModalDialogWithMinLocalizedWidth(GTK_WIDGET(gtk_dialog_),
       IDS_ALERT_DIALOG_WIDTH_CHARS);
 }
 
 void JSModalDialogGtk::ActivateAppModalDialog() {
   DCHECK(gtk_dialog_);
   gtk_window_present(GTK_WINDOW(gtk_dialog_));}
 
 void JSModalDialogGtk::CloseAppModalDialog() {
   DCHECK(gtk_dialog_);
-  HandleDialogResponse(GTK_DIALOG(gtk_dialog_), GTK_RESPONSE_DELETE_EVENT);
+  OnDialogResponse(gtk_dialog_, GTK_RESPONSE_DELETE_EVENT);
 }
 
 void JSModalDialogGtk::AcceptAppModalDialog() {
-  HandleDialogResponse(GTK_DIALOG(gtk_dialog_), GTK_RESPONSE_OK);
+  OnDialogResponse(gtk_dialog_, GTK_RESPONSE_OK);
 }
 
 void JSModalDialogGtk::CancelAppModalDialog() {
-  HandleDialogResponse(GTK_DIALOG(gtk_dialog_), GTK_RESPONSE_CANCEL);
+  OnDialogResponse(gtk_dialog_, GTK_RESPONSE_CANCEL);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // JSModalDialogGtk, private:
 
-void JSModalDialogGtk::HandleDialogResponse(GtkDialog* dialog,
-                                            gint response_id) {
+void JSModalDialogGtk::OnDialogResponse(GtkWidget* dialog,
+                                        int response_id) {
   switch (response_id) {
     case GTK_RESPONSE_OK:
       // The first arg is the prompt text and the second is true if we want to
       // suppress additional popups from the page.
-      dialog_->OnAccept(GetPromptText(dialog), ShouldSuppressJSDialogs(dialog));
+      dialog_->OnAccept(GetPromptText(GTK_DIALOG(dialog)),
+                        ShouldSuppressJSDialogs(GTK_DIALOG(dialog)));
       break;
 
     case GTK_RESPONSE_CANCEL:
     case GTK_RESPONSE_DELETE_EVENT:   // User hit the X on the dialog.
-      dialog_->OnCancel(ShouldSuppressJSDialogs(dialog));
+      dialog_->OnCancel(ShouldSuppressJSDialogs(GTK_DIALOG(dialog)));
       break;
 
     default:
       NOTREACHED();
   }
   gtk_widget_destroy(GTK_WIDGET(dialog));
 
   // Now that the dialog is gone, we can put all the  windows into separate
   // window groups so other dialogs are no longer app modal.
   gtk_util::AppModalDismissedUngroupWindows();
   delete this;
 }
 
-// static
-void JSModalDialogGtk::OnDialogResponse(GtkDialog* gtk_dialog,
-                                        gint response_id,
-                                        JSModalDialogGtk* dialog) {
-  dialog->HandleDialogResponse(gtk_dialog, response_id);
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // NativeAppModalDialog, public:
 
 // static
 NativeAppModalDialog* NativeAppModalDialog::CreateNativeJavaScriptPrompt(
     JavaScriptAppModalDialog* dialog,
     gfx::NativeWindow parent_window) {
   return new JSModalDialogGtk(dialog, parent_window);
 }
-
-