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

Still to do: get rid of things which hang on to a handler just so they can pass
it to Show().

BUG=38908
TEST=everything still works

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

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

2 files changed, 6 insertions, 8 deletions

diff --git a/chrome/browser/cocoa/bookmark_bar_controller.mm b/chrome/browser/cocoa/bookmark_bar_controller.mm
index 19025d6..1ebe272 100644
--- a/chrome/browser/cocoa/bookmark_bar_controller.mm
+++ b/chrome/browser/cocoa/bookmark_bar_controller.mm
@@ -1254,8 +1254,7 @@ static BOOL ValueInRangeInclusive(CGFloat low, CGFloat value, CGFloat high) {
                        browser_->profile(),
                        node->GetParent(),
                        BookmarkEditor::EditDetails(node),
-                       BookmarkEditor::SHOW_TREE,
-                       nil);
+                       BookmarkEditor::SHOW_TREE);
 }
 
 - (IBAction)cutBookmark:(id)sender {
@@ -1366,8 +1365,7 @@ static BOOL ValueInRangeInclusive(CGFloat low, CGFloat value, CGFloat high) {
                        browser_->profile(),
                        parent,
                        BookmarkEditor::EditDetails(),
-                       BookmarkEditor::SHOW_TREE,
-                       nil);
+                       BookmarkEditor::SHOW_TREE);
 }
 
 // Might be called from the context menu over the bar OR over a
diff --git a/chrome/browser/cocoa/bookmark_editor_base_controller.mm b/chrome/browser/cocoa/bookmark_editor_base_controller.mm
index 017d477..ac66f20 100644
--- a/chrome/browser/cocoa/bookmark_editor_base_controller.mm
+++ b/chrome/browser/cocoa/bookmark_editor_base_controller.mm
@@ -59,16 +59,16 @@ void BookmarkEditor::Show(gfx::NativeWindow parent_hwnd,
                           Profile* profile,
                           const BookmarkNode* parent,
                           const EditDetails& details,
-                          Configuration configuration,
-                          Handler* handler) {
+                          Configuration configuration) {
   BookmarkEditorBaseController* controller = nil;
+  // TODO(viettrungluu): get rid of |handler:| below and elsewhere.
   if (details.type == EditDetails::NEW_FOLDER) {
     controller = [[BookmarkAllTabsController alloc]
                   initWithParentWindow:parent_hwnd
                                profile:profile
                                 parent:parent
                          configuration:configuration
-                               handler:handler];
+                               handler:NULL];
   } else {
     controller = [[BookmarkEditorController alloc]
                   initWithParentWindow:parent_hwnd
@@ -76,7 +76,7 @@ void BookmarkEditor::Show(gfx::NativeWindow parent_hwnd,
                                 parent:parent
                                   node:details.existing_node
                          configuration:configuration
-                               handler:handler];
+                               handler:NULL];
   }
   [controller runAsModalSheet];
 }