chrome/browser/ui/cocoa/browser_window_controller.mm - Issue 7572022: Use bookmark manager to add/edit bookmark pages with webui_dialogs=1.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/cocoa/browser_window_controller.mm

Issue 7572022: Use bookmark manager to add/edit bookmark pages with webui_dialogs=1. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk

Patch Set: Created 9 years, 4 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

« chrome/browser/ui/browser.cc ('K') | « chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm ('k') | chrome/browser/ui/gtk/bookmarks/bookmark_bubble_gtk.cc » ('j') | chrome/browser/ui/gtk/bookmarks/bookmark_bubble_gtk.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/browser_window_controller.mm

diff --git a/chrome/browser/ui/cocoa/browser_window_controller.mm b/chrome/browser/ui/cocoa/browser_window_controller.mm

index 6df4d70f2622ae63fd30ad400b4c6f103a8af8ca..4aa32bdc0b5694a2564c11e7817fbbe3d531d0ed 100644

--- a/chrome/browser/ui/cocoa/browser_window_controller.mm

+++ b/chrome/browser/ui/cocoa/browser_window_controller.mm

@@ -1653,6 +1653,10 @@ typedef NSInteger NSWindowAnimationBehavior;

if (responds) {

const BookmarkNode* node = [sender node];

if (node) {

+#if defined(WEBUI_BOOKMARK_EDITOR)

+ DCHECK(browser_);

+ browser_->OpenBookmarkManagerEditNode(node->id());

+#else

// A BookmarkEditorController is a sheet that owns itself, and

// deallocates itself when closed.

[[[BookmarkEditorController alloc]

@@ -1662,6 +1666,7 @@ typedef NSInteger NSWindowAnimationBehavior;

node:node

configuration:BookmarkEditor::SHOW_TREE]

runAsModalSheet];

+#endif

}