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

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"
+#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"
 #include "chrome/browser/prefs/pref_service.h"
 #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"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 BookmarkContextMenuController::BookmarkContextMenuController(
     gfx::NativeWindow parent_window,
     BookmarkContextMenuControllerDelegate* delegate,
     Profile* profile,
@@ skipping 104 matching lines @@
     case IDC_BOOKMARK_BAR_EDIT:
       UserMetrics::RecordAction(
           UserMetricsAction("BookmarkBar_ContextMenu_Edit"));
 
       if (selection_.size() != 1) {
         NOTREACHED();
         break;
       }
 
       if (selection_[0]->is_url()) {
-        BookmarkEditor::Show(parent_window_, profile_,
-            BookmarkEditor::EditDetails::EditNode(selection_[0]),
-            BookmarkEditor::SHOW_TREE);
+        if (ChromeWebUI::IsMoreWebUI()) {

[flackr, 2011/11/02 15:38:18]

There is already a check for IsMoreWebUI in BookmarkEditor::Show, you should
trigger BookmarkInputWindowDialogController::Show from BookmarkEditor::Show to
keep the handling of IsMoreWebUI and how to edit a URL in one place.

[mazda, 2011/11/07 09:59:23]

Done.

+          BookmarkInputWindowDialogController::Show(
+              profile_,
+              parent_window_,
+              selection_[0],
+              -1,
+              BookmarkInputWindowDialogController::EXISTING_BOOKMARK_PAGE);
+        } else {
+          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);
+        BookmarkInputWindowDialogController::Show(

[flackr, 2011/11/02 15:38:18]

This could also be handled in BookmarkEditor::Show, as the means for editing
folder nodes.

[mazda, 2011/11/07 09:59:23]

Done.

+            profile_,
+            parent_window_,
+            selection_[0],
+            -1,
+            BookmarkInputWindowDialogController::EXISTING_BOOKMARK_FOLDER);
       }
       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"));
 
-      // TODO: this should honor the index from GetParentForNewNodes.
-      BookmarkEditor::Show(
-          parent_window_, profile_,
-          BookmarkEditor::EditDetails::AddNodeInFolder(
-              bookmark_utils::GetParentForNewNodes(parent_, selection_, NULL)),
-          BookmarkEditor::SHOW_TREE);
+      if (ChromeWebUI::IsMoreWebUI()) {

[flackr, 2011/11/02 15:38:18]

Same as above, I would prefer to see bookmark editing handled in one place.
BookmarkEditor::EditDetails::AddNodeInFolder will need to be changed to support
passing the index parameter.

[mazda, 2011/11/07 09:59:23]

Done.

+        int index;
+        const BookmarkNode* parent =
+            bookmark_utils::GetParentForNewNodes(parent_,
+                                                 selection_,
+                                                 &index);
+        BookmarkInputWindowDialogController::Show(
+            profile_,
+            parent_window_,
+            parent,
+            index,
+            BookmarkInputWindowDialogController::NEW_BOOKMARK_PAGE);
+      } else {
+        // TODO: this should honor the index from GetParentForNewNodes.
+        BookmarkEditor::Show(
+            parent_window_,
+            profile_,
+            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,
-          index, BookmarkFolderEditorController::NEW_BOOKMARK);
+      BookmarkInputWindowDialogController::Show(

[flackr, 2011/11/02 15:38:18]

Same as above, call BookmarkEditor::Show with new folder and handle this case
there.

[mazda, 2011/11/07 09:59:23]

Done.

+          profile_,
+          parent_window_,
+          parent,
+          index,
+          BookmarkInputWindowDialogController::NEW_BOOKMARK_FOLDER);
       break;
     }
 
     case IDC_BOOKMARK_BAR_ALWAYS_SHOW:
       bookmark_utils::ToggleWhenVisible(profile_);
       break;
 
     case IDC_BOOKMARK_MANAGER: {
       UserMetrics::RecordAction(UserMetricsAction("ShowBookmarkManager"));
       Browser* browser = BrowserList::GetLastActiveWithProfile(profile_);
@@ skipping 109 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;
 }