chrome/browser/bookmarks/bookmark_node_data.cc - 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/bookmarks/bookmark_node_data.cc

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/bookmarks/bookmark_node_data.cc

diff --git a/chrome/browser/bookmarks/bookmark_node_data.cc b/chrome/browser/bookmarks/bookmark_node_data.cc

index dda7111d00241291368e7225f4a4fb38fe18a900..8da095ef316ea3df79b4e15224830ec13c85c8e8 100644

--- a/chrome/browser/bookmarks/bookmark_node_data.cc

+++ b/chrome/browser/bookmarks/bookmark_node_data.cc

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

#include "base/pickle.h"

#include "base/strings/string_util.h"

#include "base/strings/utf_string_conversions.h"

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

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

#include "ui/base/clipboard/scoped_clipboard_writer.h"

const char* BookmarkNodeData::kClipboardFormatString =

@@ -250,7 +250,7 @@ std::vector<const BookmarkNode*> BookmarkNodeData::GetNodes(

return nodes;

for (size_t i = 0; i < elements.size(); ++i) {

- const BookmarkNode* node = model->GetNodeByID(elements[i].id_);

+ const BookmarkNode* node = GetBookmarkNodeByID(model, elements[i].id_);

if (!node) {

nodes.clear();

return nodes;