chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.mm - Issue 242823002: Extract GetNodeByID() method from BookmarkModel.

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/bookmarks/bookmark_menu_cocoa_controller.mm

Issue 242823002: Extract GetNodeByID() method from BookmarkModel. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: revert a change in bookmarks_helper.cc that colides with a wstring and cq does not like that Created 6 years, 8 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

« no previous file with comments | « chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view.mm ('k') | chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.mm

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

index e5b391aab2b266661fc11ebd74ecf87ac4580f40..43a49e2bc595d02583a9860783cb7a382c301314 100644

--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.mm

+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.mm

@@ -7,7 +7,7 @@

#include "base/strings/sys_string_conversions.h"

#include "chrome/app/chrome_command_ids.h" // IDC_BOOKMARK_MENU

#import "chrome/browser/app_controller_mac.h"

-#include "chrome/browser/bookmarks/bookmark_model.h"

+#include "chrome/browser/bookmarks/bookmark_utils.h"

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/ui/bookmarks/bookmark_utils.h"

#include "chrome/browser/ui/browser.h"

@@ -80,7 +80,7 @@ const NSUInteger kMaximumMenuPixelsWide = 300;

// Return the a BookmarkNode that has the given id (called

// "identifier" here to avoid conflict with objc's concept of "id").

- (const BookmarkNode*)nodeForIdentifier:(int)identifier {

- return bridge_->GetBookmarkModel()->GetNodeByID(identifier);

+ return GetBookmarkNodeByID(bridge_->GetBookmarkModel(), identifier);

}

// Open the URL of the given BookmarkNode in the current tab.