chrome/browser/prefs/chrome_pref_service_factory.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/prefs/chrome_pref_service_factory.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/prefs/browser_prefs.cc ('k') | chrome/browser/prefs/chrome_pref_service_unittest.cc » ('j') | components/user_prefs/pref_registry_syncable.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/prefs/chrome_pref_service_factory.cc

diff --git a/chrome/browser/prefs/chrome_pref_service_factory.cc b/chrome/browser/prefs/chrome_pref_service_factory.cc

index 792e2e8d9b1c90239763db9c59bee1567fe9998e..d3f60bb5a9d18a2060ca0111fffaed8fbe3576ed 100644

--- a/chrome/browser/prefs/chrome_pref_service_factory.cc

+++ b/chrome/browser/prefs/chrome_pref_service_factory.cc

@@ -17,10 +17,9 @@

#include "chrome/browser/policy/configuration_policy_pref_store.h"

#include "chrome/browser/prefs/command_line_pref_store.h"

#include "chrome/browser/prefs/pref_model_associator.h"

-#include "chrome/browser/prefs/pref_registry_syncable.h"

#include "chrome/browser/prefs/pref_service_syncable_builder.h"

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

#include "chrome/browser/ui/profile_error_dialog.h"

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

#include "content/public/browser/browser_context.h"

#include "content/public/browser/browser_thread.h"

#include "grit/chromium_strings.h"

@@ -93,11 +92,6 @@ void PrepareBuilder(

} // namespace

-// TODO(joi): Find a better home for this.

-PrefService* PrefServiceFromBrowserContext(BrowserContext* context) {

- return static_cast<Profile*>(context)->GetPrefs();

namespace chrome_prefs {

PrefService* CreateLocalState(