| Index: chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm
|
| ===================================================================
|
| --- chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm (revision 101584)
|
| +++ chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm (working copy)
|
| @@ -588,16 +588,22 @@
|
| return;
|
| }
|
|
|
| - // This jumps to a platform-common routine at this point (which may just
|
| - // jump back to objc or may use the WebUI dialog).
|
| +#if defined(WEBUI_DIALOGS)
|
| + browser_->OpenBookmarkManagerEditNode(node->id());
|
| +#else
|
| + // There is no real need to jump to a platform-common routine at
|
| + // this point (which just jumps back to objc) other than consistency
|
| + // across platforms.
|
| //
|
| // TODO(jrg): identify when we NO_TREE. I can see it in the code
|
| // for the other platforms but can't find a way to trigger it in the
|
| // UI.
|
| BookmarkEditor::Show([[self view] window],
|
| browser_->profile(),
|
| - BookmarkEditor::EditDetails::EditNode(node),
|
| + node->parent(),
|
| + BookmarkEditor::EditDetails(node),
|
| BookmarkEditor::SHOW_TREE);
|
| +#endif
|
| }
|
|
|
| - (IBAction)cutBookmark:(id)sender {
|
| @@ -675,10 +681,15 @@
|
| const BookmarkNode* parent = [self nodeFromMenuItem:sender];
|
| if (!parent)
|
| parent = bookmarkModel_->bookmark_bar_node();
|
| +#if defined(WEBUI_DIALOGS)
|
| + browser_->OpenBookmarkManagerAddNodeIn(parent->id());
|
| +#else
|
| BookmarkEditor::Show([[self view] window],
|
| browser_->profile(),
|
| - BookmarkEditor::EditDetails::AddNodeInFolder(parent),
|
| + parent,
|
| + BookmarkEditor::EditDetails(),
|
| BookmarkEditor::SHOW_TREE);
|
| +#endif
|
| }
|
|
|
| // Might be called from the context menu over the bar OR over a
|
|
|