diff options
| author | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-21 08:49:53 +0000 |
|---|---|---|
| committer | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-21 08:49:53 +0000 |
| commit | ac4df1ddc2b0d57433217b5d7c017783c480a74f (patch) | |
| tree | 754e119e66339c21283917c533a5dc46ac819390 /chrome/browser/profile.cc | |
| parent | a9da6bc82b7575641174d4f57f89f67a9f260c7a (diff) | |
| download | chromium_src-ac4df1ddc2b0d57433217b5d7c017783c480a74f.zip chromium_src-ac4df1ddc2b0d57433217b5d7c017783c480a74f.tar.gz chromium_src-ac4df1ddc2b0d57433217b5d7c017783c480a74f.tar.bz2 | |
Reland r45028: 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/1687001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45168 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/profile.cc')
| -rw-r--r-- | chrome/browser/profile.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/profile.cc b/chrome/browser/profile.cc index 92b2ff8..11d2120 100644 --- a/chrome/browser/profile.cc +++ b/chrome/browser/profile.cc @@ -37,6 +37,7 @@ #include "chrome/browser/host_content_settings_map.h" #include "chrome/browser/host_zoom_map.h" #include "chrome/browser/in_process_webkit/webkit_context.h" +#include "chrome/browser/json_pref_store.h" #include "chrome/browser/net/chrome_url_request_context.h" #include "chrome/browser/net/ssl_config_service_manager.h" #include "chrome/browser/notifications/desktop_notification_service.h" @@ -938,7 +939,7 @@ net::TransportSecurityState* PrefService* ProfileImpl::GetPrefs() { if (!prefs_.get()) { - prefs_.reset(new PrefService(GetPrefFilePath())); + prefs_.reset(new PrefService(new JsonPrefStore(GetPrefFilePath()))); // The Profile class and ProfileManager class may read some prefs so // register known prefs as soon as possible. |