diff options
| author | sanjeevr@chromium.org <sanjeevr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-21 15:01:35 +0000 |
|---|---|---|
| committer | sanjeevr@chromium.org <sanjeevr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-21 15:01:35 +0000 |
| commit | ea587b01337fd38626923e48258a2b39a631543a (patch) | |
| tree | 944b56193e7870f97877836e490556b0983f5b0a /chrome/browser/profile.cc | |
| parent | 893934384f65e8676d226396c34625880a46436a (diff) | |
| download | chromium_src-ea587b01337fd38626923e48258a2b39a631543a.zip chromium_src-ea587b01337fd38626923e48258a2b39a631543a.tar.gz chromium_src-ea587b01337fd38626923e48258a2b39a631543a.tar.bz2 | |
Removed dependency on ChromeThread from JsonPrefStore and moved JsonPrefStore and PrefStore to chrome/common. This is because JsonPrefStore is needed in the service process
BUG=None.
TEST=Updated unit-tests
Review URL: http://codereview.chromium.org/2066015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47915 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/profile.cc')
| -rw-r--r-- | chrome/browser/profile.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/chrome/browser/profile.cc b/chrome/browser/profile.cc index c03553f..1a01523 100644 --- a/chrome/browser/profile.cc +++ b/chrome/browser/profile.cc @@ -41,7 +41,6 @@ #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" @@ -68,6 +67,7 @@ #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" +#include "chrome/common/json_pref_store.h" #include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" #include "chrome/common/render_messages.h" @@ -987,7 +987,10 @@ net::TransportSecurityState* PrefService* ProfileImpl::GetPrefs() { if (!prefs_.get()) { - prefs_.reset(new PrefService(new JsonPrefStore(GetPrefFilePath()))); + prefs_.reset(new PrefService( + new JsonPrefStore( + GetPrefFilePath(), + ChromeThread::GetMessageLoopProxyForThread(ChromeThread::FILE)))); // The Profile class and ProfileManager class may read some prefs so // register known prefs as soon as possible. |