chrome/browser/bookmarks/bookmark_expanded_state_tracker.cc - Issue 12340111: Introduce //components/user_prefs, use to eliminate c/b/prefs dependency in Autofill.

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 12340111: Introduce //components/user_prefs, use to eliminate c/b/prefs dependency in Autofill. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Pure merge of LKGR Created 7 years, 10 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/background/background_contents_service_factory.cc ('k') | chrome/browser/bookmarks/bookmark_model_factory.cc » ('j') | components/user_prefs/pref_registry_syncable.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 251cdf0d94358a17a5c00196831e64e3144ea4a4..5c1d712cadd061f0d62dd731c3558ecb46effdd6 100644

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

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

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

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

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

#include "chrome/common/pref_names.h"

+#include "components/user_prefs/user_prefs.h"

BookmarkExpandedStateTracker::BookmarkExpandedStateTracker(

content::BrowserContext* browser_context,

@@ -32,7 +33,7 @@ BookmarkExpandedStateTracker::GetExpandedNodes() {

if (!bookmark_model_->IsLoaded())

return nodes;

- PrefService* prefs = PrefServiceFromBrowserContext(browser_context_);

+ PrefService* prefs = components::UserPrefs::Get(browser_context_);

if (!prefs)

return nodes;

@@ -88,7 +89,7 @@ void BookmarkExpandedStateTracker::BookmarkNodeRemoved(

}

void BookmarkExpandedStateTracker::UpdatePrefs(const Nodes& nodes) {

- PrefService* prefs = PrefServiceFromBrowserContext(browser_context_);

+ PrefService* prefs = components::UserPrefs::Get(browser_context_);

if (!prefs)

return;