chrome/browser/chrome_browser_main.cc - Issue 11570009: Split PrefService into PrefService, PrefServiceSimple and PrefServiceSyncable.

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: Ready for review. 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

« chrome/browser/browser_process_impl.cc ('K') | « chrome/browser/browsing_data/cookies_tree_model_unittest.cc ('k') | chrome/browser/chrome_browser_main_unittest.cc » ('j') | chrome/browser/component_updater/recovery_component_installer.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | 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 c9418756becf712123e5d7e26f13aeb7d84ffa4d..d5f8c8a107f5e7e54fa993c3a2940b949f19e02f 100644

--- a/chrome/browser/chrome_browser_main.cc

+++ b/chrome/browser/chrome_browser_main.cc

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

#include "chrome/browser/performance_monitor/startup_timer.h"

#include "chrome/browser/plugins/plugin_prefs.h"

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

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

+#include "chrome/browser/prefs/chrome_pref_service_factory.h"

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

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

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

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

@@ -232,7 +233,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

@@ -278,8 +279,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(

+ ChromePrefServiceFactory().CreateLocalState(

parent_profile,

local_state_task_runner,

g_browser_process->policy_service(),

@@ -751,7 +752,8 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {

// needed on Android as there aren't experimental flags.

about_flags::ConvertFlagsToSwitches(local_state_,

CommandLine::ForCurrentProcess());

- local_state_->UpdateCommandLinePrefStore(CommandLine::ForCurrentProcess());

Mattias Nissler (ping if slow) 2012/12/19 19:50:22 Ugh, UpdateCommandLinePrefStore shouldn't be in th

Jói 2012/12/20 16:30:31 Sounds good, thanks.

+ local_state_->UpdateCommandLinePrefStore(

+ new CommandLinePrefStore(CommandLine::ForCurrentProcess()));

// Reset the command line in the crash report details, since we may have

// just changed it to include experiments.