Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3657)

Unified Diff: chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm

Issue 7919028: Revert 101581 - Add --use-more-webui runtime flag to toggle WebUI replacements for native dialogs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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
« no previous file with comments | « chrome/browser/ui/browser_dialogs.h ('k') | chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698