summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browser_main.cc
diff options
context:
space:
mode:
authorbauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-20 12:54:38 +0000
committerbauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-20 12:54:38 +0000
commit567992f73daa8230886040ad3eb0a54e721e0e93 (patch)
tree04bf2c971318f8cf80672c048bb2c8837b165b53 /chrome/browser/browser_main.cc
parent933fad92326fe5050281b649ea1c1783dad76c57 (diff)
downloadchromium_src-567992f73daa8230886040ad3eb0a54e721e0e93.zip
chromium_src-567992f73daa8230886040ad3eb0a54e721e0e93.tar.gz
chromium_src-567992f73daa8230886040ad3eb0a54e721e0e93.tar.bz2
Factor out reading and writing of preferences into |PrefStore|.
In order to implement platform-specific policies, reading and writing preferences needs to be abstracted from the |PrefService|. The interface for that is now |PrefStore|, with an implementation |JsonPrefStore|, which stores the pref data in a JSON file. There is another implementation, |DummyPrefStore|, which doesn't store any persistent preferences, and is currently used for tests. Most of the changes are for using the new interface, which is |new PrefService(new JsonPrefStore(filename))| instead of |new PrefService(filename)|. BUG=40259 TEST=PrefServiceTest.*:PrefServiceSetValueTest.*:PrefMemberTest.*:JsonPrefStoreTest.* Review URL: http://codereview.chromium.org/1523023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45028 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_main.cc')
-rw-r--r--chrome/browser/browser_main.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc
index f83d34a..97c1ef0 100644
--- a/chrome/browser/browser_main.cc
+++ b/chrome/browser/browser_main.cc
@@ -40,6 +40,7 @@
#include "chrome/browser/extensions/extensions_service.h"
#include "chrome/browser/first_run.h"
#include "chrome/browser/jankometer.h"
+#include "chrome/browser/json_pref_store.h"
#include "chrome/browser/metrics/histogram_synchronizer.h"
#include "chrome/browser/metrics/metrics_service.h"
#include "chrome/browser/net/dns_global.h"
@@ -430,7 +431,7 @@ PrefService* InitializeLocalState(const CommandLine& parsed_command_line,
parsed_command_line.HasSwitch(switches::kParentProfile)) {
FilePath parent_profile =
parsed_command_line.GetSwitchValuePath(switches::kParentProfile);
- PrefService parent_local_state(parent_profile);
+ PrefService parent_local_state(new JsonPrefStore(parent_profile));
parent_local_state.RegisterStringPref(prefs::kApplicationLocale,
std::wstring());
// Right now, we only inherit the locale setting from the parent profile.