Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3327)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/chrome_browser_main.cc

Issue 11570009: Split PrefService into PrefService, PrefServiceSimple and PrefServiceSyncable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: WIP, latest changes from kaiwang@ Created 8 years 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/browser_shutdown.cc ('k') | chrome/browser/chrome_content_browser_client.h » ('j') | chrome/browser/prefs/chrome_pref_service_builder.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chrome_browser_main.cc
diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
index d2c4108346f3a48697b7ad5f661a5b966c1f06df..3c1a566291b41636c801e162036fe5641ce15643 100644
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -231,7 +231,7 @@ PrefService* InitializeLocalState(
// Load local state. This includes the application locale so we know which
// locale dll to load.
- PrefService* local_state = g_browser_process->local_state();
+ PrefServiceSimple* local_state = g_browser_process->local_state();
DCHECK(local_state);
// TODO(brettw,*): this comment about ResourceBundle was here since
@@ -277,8 +277,8 @@ PrefService* InitializeLocalState(
parsed_command_line.HasSwitch(switches::kParentProfile)) {
FilePath parent_profile =
parsed_command_line.GetSwitchValuePath(switches::kParentProfile);
- scoped_ptr<PrefService> parent_local_state(
- ChromePrefServiceBuilder().CreateChromePrefs(
+ scoped_ptr<PrefServiceSimple> parent_local_state(
+ ChromePrefServiceBuilder().CreateLocalState(
parent_profile,
local_state_task_runner,
g_browser_process->policy_service(),
« no previous file with comments | « chrome/browser/browser_shutdown.cc ('k') | chrome/browser/chrome_content_browser_client.h » ('j') | chrome/browser/prefs/chrome_pref_service_builder.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698