chrome/browser/bookmarks/bookmark_model.cc - Issue 18536005: bookmarks: Change BookmarkExpandedStateTracker to take PrefService.

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_model.cc

Issue 18536005: bookmarks: Change BookmarkExpandedStateTracker to take PrefService. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 5 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_model.cc

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

index eff176ec4df8b791b9f0399b5eb830dbc91c0340..2ddeb6e6e0c152b1b86f06644348ef9a652fe5ef 100644

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

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

@@ -15,7 +15,6 @@

#include "base/strings/string_util.h"

#include "base/strings/utf_string_conversions.h"

#include "base/values.h"

-#include "build/build_config.h"

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

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

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

@@ -262,8 +261,8 @@ void BookmarkModel::Load(

return;

}

- expanded_state_tracker_.reset(new BookmarkExpandedStateTracker(

- profile_, this));

+ expanded_state_tracker_.reset(

+ new BookmarkExpandedStateTracker(this, profile_->GetPrefs()));

// Listen for changes to favicons so that we can update the favicon of the

// node appropriately.

« no previous file with comments | « chrome/browser/bookmarks/bookmark_expanded_state_tracker.cc ('k') | no next file » | no next file with comments »