Reland add --use-more-webui runtime flag to toggle WebUI replacements for native dialogs.

chrome/browser/bookmarks/bookmark_context_menu_controller.cc

 // Copyright (c) 2011 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/bookmarks/bookmark_context_menu_controller.h"
 
 #include "base/compiler_specific.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/bookmarks/bookmark_editor.h"
 #include "chrome/browser/bookmarks/bookmark_folder_editor_controller.h"
@@ skipping 121 matching lines @@
     case IDC_BOOKMARK_BAR_EDIT:
       UserMetrics::RecordAction(
           UserMetricsAction("BookmarkBar_ContextMenu_Edit"));
 
       if (selection_.size() != 1) {
         NOTREACHED();
         break;
       }
 
       if (selection_[0]->is_url()) {
-#if defined(WEBUI_DIALOGS)
-        Browser* browser = BrowserList::GetLastActiveWithProfile(profile_);
-        DCHECK(browser);
-        browser->OpenBookmarkManagerEditNode(selection_[0]->id());
-#else
-        BookmarkEditor::Show(parent_window_, profile_, parent_,
-                             BookmarkEditor::EditDetails(selection_[0]),
-                             BookmarkEditor::SHOW_TREE);
-#endif
+        BookmarkEditor::Show(parent_window_, profile_,
+            BookmarkEditor::EditDetails::EditNode(selection_[0]),
+            BookmarkEditor::SHOW_TREE);
       } else {
         BookmarkFolderEditorController::Show(profile_, parent_window_,
             selection_[0], -1,
             BookmarkFolderEditorController::EXISTING_BOOKMARK);
       }
       break;
 
     case IDC_BOOKMARK_BAR_REMOVE: {
       UserMetrics::RecordAction(
           UserMetricsAction("BookmarkBar_ContextMenu_Remove"));
 
       for (size_t i = 0; i < selection_.size(); ++i) {
         int index = selection_[i]->parent()->GetIndexOf(selection_[i]);
         if (index > -1)
           model_->Remove(selection_[i]->parent(), index);
       }
       selection_.clear();
       break;
     }
 
     case IDC_BOOKMARK_BAR_ADD_NEW_BOOKMARK: {
       UserMetrics::RecordAction(
           UserMetricsAction("BookmarkBar_ContextMenu_Add"));
 
-#if defined(WEBUI_DIALOGS)
-      Browser* browser = BrowserList::GetLastActiveWithProfile(profile_);
-      DCHECK(browser);
-      browser->OpenBookmarkManagerAddNodeIn(selection_[0]->id());
-#else
       // TODO: this should honor the index from GetParentForNewNodes.
       BookmarkEditor::Show(
           parent_window_, profile_,
-          bookmark_utils::GetParentForNewNodes(parent_, selection_, NULL),
-          BookmarkEditor::EditDetails(), BookmarkEditor::SHOW_TREE);
-#endif
+          BookmarkEditor::EditDetails::AddNodeInFolder(
+              bookmark_utils::GetParentForNewNodes(parent_, selection_, NULL)),
+          BookmarkEditor::SHOW_TREE);
       break;
     }
 
     case IDC_BOOKMARK_BAR_NEW_FOLDER: {
       UserMetrics::RecordAction(
           UserMetricsAction("BookmarkBar_ContextMenu_NewFolder"));
       int index;
       const BookmarkNode* parent =
           bookmark_utils::GetParentForNewNodes(parent_, selection_, &index);
       BookmarkFolderEditorController::Show(profile_, parent_window_, parent,
@@ skipping 120 matching lines @@
     delegate_->CloseMenu();
 }
 
 bool BookmarkContextMenuController::HasURLs() const {
   for (size_t i = 0; i < selection_.size(); ++i) {
     if (bookmark_utils::NodeHasURLs(selection_[i]))
       return true;
   }
   return false;
 }