| Index: chrome/browser/bookmarks/bookmark_context_menu_controller.cc
|
| ===================================================================
|
| --- chrome/browser/bookmarks/bookmark_context_menu_controller.cc (revision 101584)
|
| +++ chrome/browser/bookmarks/bookmark_context_menu_controller.cc (working copy)
|
| @@ -139,9 +139,15 @@
|
| }
|
|
|
| if (selection_[0]->is_url()) {
|
| - BookmarkEditor::Show(parent_window_, profile_,
|
| - BookmarkEditor::EditDetails::EditNode(selection_[0]),
|
| - BookmarkEditor::SHOW_TREE);
|
| +#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
|
| } else {
|
| BookmarkFolderEditorController::Show(profile_, parent_window_,
|
| selection_[0], -1,
|
| @@ -166,12 +172,17 @@
|
| 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_,
|
| - BookmarkEditor::EditDetails::AddNodeInFolder(
|
| - bookmark_utils::GetParentForNewNodes(parent_, selection_, NULL)),
|
| - BookmarkEditor::SHOW_TREE);
|
| + bookmark_utils::GetParentForNewNodes(parent_, selection_, NULL),
|
| + BookmarkEditor::EditDetails(), BookmarkEditor::SHOW_TREE);
|
| +#endif
|
| break;
|
| }
|
|
|
|
|