8 files changed, 18 insertions, 13 deletions
diff --git a/chrome/browser/gtk/accelerators_gtk.cc b/chrome/browser/gtk/accelerators_gtk.cc
index f73d03a..9d7a5b9 100644
--- a/chrome/browser/gtk/accelerators_gtk.cc
+++ b/chrome/browser/gtk/accelerators_gtk.cc
@@ -188,6 +188,8 @@ AcceleratorsGtk::AcceleratorsGtk() {
   }
 }
 
+AcceleratorsGtk::~AcceleratorsGtk() {}
+
 const menus::AcceleratorGtk* AcceleratorsGtk::GetPrimaryAcceleratorForCommand(
     int command_id) {
   base::hash_map<int, menus::AcceleratorGtk>::const_iterator iter =
diff --git a/chrome/browser/gtk/accelerators_gtk.h b/chrome/browser/gtk/accelerators_gtk.h
index de08f914..1ea7ce4 100644
--- a/chrome/browser/gtk/accelerators_gtk.h
+++ b/chrome/browser/gtk/accelerators_gtk.h
@@ -12,7 +12,7 @@
 class AcceleratorsGtk {
  public:
   AcceleratorsGtk();
-  ~AcceleratorsGtk() { }
+  ~AcceleratorsGtk();
 
   typedef std::vector<std::pair<int, menus::AcceleratorGtk> >
       AcceleratorGtkList;
diff --git a/chrome/browser/gtk/gconf_titlebar_listener.cc b/chrome/browser/gtk/gconf_titlebar_listener.cc
index 671c197b..81b5ef0 100644
--- a/chrome/browser/gtk/gconf_titlebar_listener.cc
+++ b/chrome/browser/gtk/gconf_titlebar_listener.cc
@@ -42,6 +42,10 @@ void GConfTitlebarListener::RemoveObserver(BrowserTitlebar* titlebar) {
   titlebars_.erase(titlebar);
 }
 
+// Protected:
+
+GConfTitlebarListener::~GConfTitlebarListener() {}
+
 // Private:
 
 GConfTitlebarListener::GConfTitlebarListener() : client_(NULL) {
diff --git a/chrome/browser/gtk/gconf_titlebar_listener.h b/chrome/browser/gtk/gconf_titlebar_listener.h
index 4b37588..19318eb 100644
--- a/chrome/browser/gtk/gconf_titlebar_listener.h
+++ b/chrome/browser/gtk/gconf_titlebar_listener.h
@@ -33,7 +33,7 @@ class GConfTitlebarListener {
   void RemoveObserver(BrowserTitlebar* titlebar);
 
  protected:
-  virtual ~GConfTitlebarListener() {}
+  virtual ~GConfTitlebarListener();
 
  private:
   // Private constructor to enforce singleton access.
diff --git a/chrome/browser/gtk/import_lock_dialog_gtk.cc b/chrome/browser/gtk/import_lock_dialog_gtk.cc
index 02c4b8d..8fcaefe 100644
--- a/chrome/browser/gtk/import_lock_dialog_gtk.cc
+++ b/chrome/browser/gtk/import_lock_dialog_gtk.cc
@@ -40,11 +40,13 @@ ImportLockDialogGtk::ImportLockDialogGtk(GtkWindow* parent,
   gtk_box_pack_start(GTK_BOX(content_area), label, FALSE, FALSE, 0);
 
   g_signal_connect(dialog_, "response",
-                   G_CALLBACK(HandleOnResponseDialog), this);
+                   G_CALLBACK(OnDialogResponseThunk), this);
   gtk_window_set_resizable(GTK_WINDOW(dialog_), FALSE);
   gtk_widget_show_all(dialog_);
 }
 
+ImportLockDialogGtk::~ImportLockDialogGtk() {}
+
 void ImportLockDialogGtk::OnDialogResponse(GtkWidget* widget, int response) {
   if (response == GTK_RESPONSE_ACCEPT) {
     MessageLoop::current()->PostTask(FROM_HERE, NewRunnableMethod(
diff --git a/chrome/browser/gtk/import_lock_dialog_gtk.h b/chrome/browser/gtk/import_lock_dialog_gtk.h
index 96f9b13..e22e823 100644
--- a/chrome/browser/gtk/import_lock_dialog_gtk.h
+++ b/chrome/browser/gtk/import_lock_dialog_gtk.h
@@ -8,6 +8,7 @@
 
 #include <gtk/gtk.h>
 
+#include "app/gtk_signal.h"
 #include "base/basictypes.h"
 #include "base/ref_counted.h"
 
@@ -20,15 +21,9 @@ class ImportLockDialogGtk {
 
  private:
   ImportLockDialogGtk(GtkWindow* parent, ImporterHost* importer_host);
-  ~ImportLockDialogGtk() { }
-
-  static void HandleOnResponseDialog(GtkWidget* widget,
-                                     int response,
-                                     gpointer user_data) {
-    reinterpret_cast<ImportLockDialogGtk*>(user_data)->OnDialogResponse(
-        widget, response);
-  }
-  void OnDialogResponse(GtkWidget* widget, int response);
+  ~ImportLockDialogGtk();
+
+  CHROMEGTK_CALLBACK_1(ImportLockDialogGtk, void, OnDialogResponse, int);
 
   // Dialog box
   GtkWidget* dialog_;
diff --git a/chrome/browser/gtk/import_progress_dialog_gtk.cc b/chrome/browser/gtk/import_progress_dialog_gtk.cc
index 7e0e297..b405b13 100644
--- a/chrome/browser/gtk/import_progress_dialog_gtk.cc
+++ b/chrome/browser/gtk/import_progress_dialog_gtk.cc
@@ -189,6 +189,8 @@ ImportProgressDialogGtk::ImportProgressDialogGtk(const string16& source_profile,
   gtk_window_set_resizable(GTK_WINDOW(dialog_), FALSE);
 }
 
+ImportProgressDialogGtk::~ImportProgressDialogGtk() {}
+
 void ImportProgressDialogGtk::CloseDialog() {
   gtk_widget_destroy(dialog_);
   dialog_ = NULL;
diff --git a/chrome/browser/gtk/import_progress_dialog_gtk.h b/chrome/browser/gtk/import_progress_dialog_gtk.h
index d7a6408..360b0de 100644
--- a/chrome/browser/gtk/import_progress_dialog_gtk.h
+++ b/chrome/browser/gtk/import_progress_dialog_gtk.h
@@ -32,7 +32,7 @@ class ImportProgressDialogGtk : public ImporterHost::Observer {
   ImportProgressDialogGtk(const string16& source_profile, int16 items,
       ImporterHost* importer_host, ImportObserver* observer,
       GtkWindow* parent, bool bookmarks_import);
-  ~ImportProgressDialogGtk() { }
+  virtual ~ImportProgressDialogGtk();
 
   static void HandleOnResponseDialog(GtkWidget* widget,
                                      int response,