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

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

index 95f49402cf936049393667267a83b50e5e04cb0d..c8c26e060653c352455c8348e2bfb5d2806ad18c 100644

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

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

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

#include "base/strings/string_number_conversions.h"

#include "base/values.h"

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

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

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

#include "components/bookmarks/core/common/bookmark_pref_names.h"

BookmarkExpandedStateTracker::BookmarkExpandedStateTracker(

@@ -47,7 +47,7 @@ BookmarkExpandedStateTracker::GetExpandedNodes() {

int64 node_id;

const BookmarkNode* node;

if ((*i)->GetAsString(&value) && base::StringToInt64(value, &node_id) &&

- (node = bookmark_model_->GetNodeByID(node_id)) != NULL &&

+ (node = GetBookmarkNodeByID(bookmark_model_, node_id)) != NULL &&

node->is_folder()) {

nodes.insert(node);

} else {