Get rid of BookmarkEditor::Show()'s BookmarkEditor::Handler argument.

chrome/browser/gtk/bookmark_editor_gtk.cc

Index: chrome/browser/gtk/bookmark_editor_gtk.cc
diff --git a/chrome/browser/gtk/bookmark_editor_gtk.cc b/chrome/browser/gtk/bookmark_editor_gtk.cc
index de717c72a1bbe461b871f671265e93eb077f5271..dc631e548518ab3a7da9dc8ac2326bbfff10aa76 100644
--- a/chrome/browser/gtk/bookmark_editor_gtk.cc
+++ b/chrome/browser/gtk/bookmark_editor_gtk.cc
@@ -41,12 +41,11 @@ void BookmarkEditor::Show(gfx::NativeWindow parent_hwnd,
                           Profile* profile,
                           const BookmarkNode* parent,
                           const EditDetails& details,
-                          Configuration configuration,
-                          Handler* handler) {
+                          Configuration configuration) {
   DCHECK(profile);
   BookmarkEditorGtk* editor =
       new BookmarkEditorGtk(parent_hwnd, profile, parent, details,
-                            configuration, handler);
+                            configuration);
   editor->Show();
 }
 
@@ -55,15 +54,13 @@ BookmarkEditorGtk::BookmarkEditorGtk(
     Profile* profile,
     const BookmarkNode* parent,
     const EditDetails& details,
-    BookmarkEditor::Configuration configuration,
-    BookmarkEditor::Handler* handler)
+    BookmarkEditor::Configuration configuration)
     : profile_(profile),
       dialog_(NULL),
       parent_(parent),
       details_(details),
       running_menu_for_root_(false),
-      show_tree_(configuration == SHOW_TREE),
-      handler_(handler) {
+      show_tree_(configuration == SHOW_TREE) {
   DCHECK(profile);
   Init(window);
 }
@@ -316,7 +313,7 @@ void BookmarkEditorGtk::ApplyEdits(GtkTreeIter* selected_parent) {
 
   if (!show_tree_ || !selected_parent) {
     bookmark_utils::ApplyEditsWithNoGroupChange(
-        bb_model_, parent_, details_, new_title, new_url, handler_.get());
+        bb_model_, parent_, details_, new_title, new_url, NULL);
     return;
   }
 
@@ -332,7 +329,7 @@ void BookmarkEditorGtk::ApplyEdits(GtkTreeIter* selected_parent) {
   }
 
   bookmark_utils::ApplyEditsWithPossibleGroupChange(
-      bb_model_, new_parent, details_, new_title, new_url, handler_.get());
+      bb_model_, new_parent, details_, new_title, new_url, NULL);

[sky, 2010/04/28 16:09:45]

Can you cleanup up bookmark_utils too?

[viettrungluu, 2010/04/28 16:20:09]

One step at a time. ;-) I have to make sure that no handler gets passed in in
the Mac code (a little more annoying due to messy code). Probably I'll be able
to get rid of BookmarkEditor::Handler altogether.

 }
 
 void BookmarkEditorGtk::AddNewGroup(GtkTreeIter* parent, GtkTreeIter* child) {