Change 'Add Page' to show a simple input dialog with --use-more-webui.

chrome/browser/ui/views/bookmarks/bookmark_context_menu_controller_views.cc

Index: chrome/browser/ui/views/bookmarks/bookmark_context_menu_controller_views.cc
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_context_menu_controller_views.cc b/chrome/browser/ui/views/bookmarks/bookmark_context_menu_controller_views.cc
index 41e9cd65e9453c49c8a1d8c9bb62c3b38d0a3b62..1b0a2554920b1eb4ed05a22ac903d61221b5f6bd 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_context_menu_controller_views.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_context_menu_controller_views.cc
@@ -7,7 +7,7 @@
 #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"
+#include "chrome/browser/bookmarks/bookmark_input_window_dialog_controller.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/prefs/incognito_mode_prefs.h"
@@ -15,6 +15,7 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
+#include "chrome/browser/ui/webui/chrome_web_ui.h"
 #include "chrome/common/pref_names.h"
 #include "content/browser/tab_contents/page_navigator.h"
 #include "content/browser/user_metrics.h"
@@ -131,13 +132,27 @@ void BookmarkContextMenuControllerViews::ExecuteCommand(int id) {
       }
 
       if (selection_[0]->is_url()) {
-        BookmarkEditor::Show(parent_widget_->GetNativeWindow(), profile_,
-            BookmarkEditor::EditDetails::EditNode(selection_[0]),
-            BookmarkEditor::SHOW_TREE);
+        if (ChromeWebUI::IsMoreWebUI()) {
+          BookmarkInputWindowDialogController::Show(
+              profile_,
+              parent_widget_->GetNativeWindow(),
+              selection_[0],
+              -1,
+              BookmarkInputWindowDialogController::EXISTING_BOOKMARK_PAGE);
+        } else {
+          BookmarkEditor::Show(
+              parent_widget_->GetNativeWindow(),
+              profile_,
+              BookmarkEditor::EditDetails::EditNode(selection_[0]),
+              BookmarkEditor::SHOW_TREE);
+        }
       } else {
-        BookmarkFolderEditorController::Show(profile_,
-            parent_widget_->GetNativeWindow(), selection_[0], -1,
-            BookmarkFolderEditorController::EXISTING_BOOKMARK);
+        BookmarkInputWindowDialogController::Show(
+            profile_,
+            parent_widget_->GetNativeWindow(),
+            selection_[0],
+            -1,
+            BookmarkInputWindowDialogController::EXISTING_BOOKMARK_FOLDER);
       }
       break;
 
@@ -159,12 +174,27 @@ void BookmarkContextMenuControllerViews::ExecuteCommand(int id) {
       UserMetrics::RecordAction(
           UserMetricsAction("BookmarkBar_ContextMenu_Add"));
 
-      // TODO: this should honor the index from GetParentForNewNodes.
-      BookmarkEditor::Show(
-          parent_widget_->GetNativeWindow(), profile_,
-          BookmarkEditor::EditDetails::AddNodeInFolder(
-            bookmark_utils::GetParentForNewNodes(parent_, selection_, NULL)),
-          BookmarkEditor::SHOW_TREE);
+      if (ChromeWebUI::IsMoreWebUI()) {
+        int index;
+        const BookmarkNode* parent =
+            bookmark_utils::GetParentForNewNodes(parent_, selection_, &index);
+        BookmarkInputWindowDialogController::Show(
+            profile_,
+            parent_widget_->GetNativeWindow(),
+            parent,
+            index,
+            BookmarkInputWindowDialogController::NEW_BOOKMARK_PAGE);
+      } else {
+        // TODO: this should honor the index from GetParentForNewNodes.
+        BookmarkEditor::Show(
+            parent_widget_->GetNativeWindow(),
+            profile_,
+            BookmarkEditor::EditDetails::AddNodeInFolder(
+                bookmark_utils::GetParentForNewNodes(parent_,
+                                                     selection_,
+                                                     NULL)),
+            BookmarkEditor::SHOW_TREE);
+      }
       break;
     }
 
@@ -174,9 +204,9 @@ void BookmarkContextMenuControllerViews::ExecuteCommand(int id) {
       int index;
       const BookmarkNode* parent =
           bookmark_utils::GetParentForNewNodes(parent_, selection_, &index);
-      BookmarkFolderEditorController::Show(profile_,
+      BookmarkInputWindowDialogController::Show(profile_,
            parent_widget_->GetNativeWindow(), parent, index,
-           BookmarkFolderEditorController::NEW_BOOKMARK);
+           BookmarkInputWindowDialogController::NEW_BOOKMARK_FOLDER);
       break;
     }