chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_view.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_bar_folder_view.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:

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

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

index 3a62c85c4c8c31cf51c31059b55920a087f4f986..9c3d35bb8fa1495102f49961e5108d4342d3b08e 100644

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

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

@@ -5,6 +5,7 @@

#import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_view.h"

#include "chrome/browser/bookmarks/bookmark_pasteboard_helper_mac.h"

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

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

#import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h"

#import "chrome/browser/ui/cocoa/bookmarks/bookmark_folder_target.h"

@@ -161,7 +162,7 @@ using base::UserMetricsAction;

const BookmarkModel* const model = [[self controller] bookmarkModel];

const BookmarkNode* const source_node = [button bookmarkNode];

const BookmarkNode* const target_node =

- model->GetNodeByID(source_node->id());

+ GetBookmarkNodeByID(model, source_node->id());

BOOL copy =

!([info draggingSourceOperationMask] & NSDragOperationMove) ||