diff options
| author | pam@chromium.org <pam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-16 11:48:21 +0000 |
|---|---|---|
| committer | pam@chromium.org <pam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-16 11:48:21 +0000 |
| commit | 8664dfb1f41cb9c51e50b3f7c4d78b24d29408d8 (patch) | |
| tree | b87113a3ed8f5594daf03d0d5a3134e504dcadd4 /chrome/browser/pref_service.cc | |
| parent | 7c983cc803a9b4a9ada8a43c3091a0bf6be78418 (diff) | |
| download | chromium_src-8664dfb1f41cb9c51e50b3f7c4d78b24d29408d8.zip chromium_src-8664dfb1f41cb9c51e50b3f7c4d78b24d29408d8.tar.gz chromium_src-8664dfb1f41cb9c51e50b3f7c4d78b24d29408d8.tar.bz2 | |
Add a PrefStore for loading prefs from command-line switches.
The first users are proxies and locale, for policies.
BUG=49162
TEST=covered by unit tests
Review URL: http://codereview.chromium.org/3025001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52650 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/pref_service.cc')
| -rw-r--r-- | chrome/browser/pref_service.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome/browser/pref_service.cc b/chrome/browser/pref_service.cc index fcc8af3..a6f824c 100644 --- a/chrome/browser/pref_service.cc +++ b/chrome/browser/pref_service.cc @@ -29,6 +29,7 @@ #endif #include "chrome/browser/dummy_configuration_policy_provider.h" +#include "chrome/browser/command_line_pref_store.h" #include "chrome/browser/configuration_policy_pref_store.h" #include "chrome/browser/extensions/extension_pref_store.h" #include "chrome/common/chrome_paths.h" @@ -94,6 +95,8 @@ void NotifyReadError(PrefService* pref, int message_id) { PrefService* PrefService::CreatePrefService(const FilePath& pref_filename) { PrefStore* managed_prefs = NULL; ExtensionPrefStore* extension_prefs = new ExtensionPrefStore(NULL); + CommandLinePrefStore* command_line_prefs = new CommandLinePrefStore( + CommandLine::ForCurrentProcess()); PrefStore* local_prefs = new JsonPrefStore( pref_filename, ChromeThread::GetMessageLoopProxyForThread(ChromeThread::FILE)); @@ -134,6 +137,7 @@ PrefService* PrefService::CreatePrefService(const FilePath& pref_filename) { PrefValueStore* value_store = new PrefValueStore( managed_prefs, extension_prefs, + command_line_prefs, local_prefs, recommended_prefs); @@ -149,6 +153,7 @@ PrefService* PrefService::CreateUserPrefService( PrefValueStore* value_store = new PrefValueStore( NULL, /* no enforced prefs */ NULL, /* no extension prefs */ + NULL, /* no command-line prefs */ new JsonPrefStore( pref_filename, ChromeThread::GetMessageLoopProxyForThread(ChromeThread::FILE)), |