Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(185)

Side by Side Diff: chrome/browser/prefs/pref_service.cc

Issue 11027070: Moved JsonPrefStore to use SequencedWorkerPool (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 2 months 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/prefs/pref_service.h" 5 #include "chrome/browser/prefs/pref_service.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
11 #include "base/file_path.h" 11 #include "base/file_path.h"
12 #include "base/file_util.h" 12 #include "base/file_util.h"
13 #include "base/logging.h" 13 #include "base/logging.h"
14 #include "base/message_loop.h" 14 #include "base/message_loop.h"
15 #include "base/metrics/histogram.h" 15 #include "base/metrics/histogram.h"
16 #include "base/stl_util.h" 16 #include "base/stl_util.h"
17 #include "base/string_number_conversions.h" 17 #include "base/string_number_conversions.h"
18 #include "base/string_util.h" 18 #include "base/string_util.h"
19 #include "base/threading/sequenced_worker_pool.h"
19 #include "base/value_conversions.h" 20 #include "base/value_conversions.h"
20 #include "build/build_config.h" 21 #include "build/build_config.h"
21 #include "chrome/browser/browser_process.h" 22 #include "chrome/browser/browser_process.h"
22 #include "chrome/browser/extensions/extension_pref_store.h" 23 #include "chrome/browser/extensions/extension_pref_store.h"
23 #include "chrome/browser/policy/configuration_policy_pref_store.h" 24 #include "chrome/browser/policy/configuration_policy_pref_store.h"
24 #include "chrome/browser/prefs/command_line_pref_store.h" 25 #include "chrome/browser/prefs/command_line_pref_store.h"
25 #include "chrome/browser/prefs/default_pref_store.h" 26 #include "chrome/browser/prefs/default_pref_store.h"
26 #include "chrome/browser/prefs/overlay_user_pref_store.h" 27 #include "chrome/browser/prefs/overlay_user_pref_store.h"
27 #include "chrome/browser/prefs/pref_model_associator.h" 28 #include "chrome/browser/prefs/pref_model_associator.h"
28 #include "chrome/browser/prefs/pref_notifier_impl.h" 29 #include "chrome/browser/prefs/pref_notifier_impl.h"
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 ConfigurationPolicyPrefStore* recommended = 148 ConfigurationPolicyPrefStore* recommended =
148 ConfigurationPolicyPrefStore::CreateRecommendedPolicyPrefStore( 149 ConfigurationPolicyPrefStore::CreateRecommendedPolicyPrefStore(
149 policy_service); 150 policy_service);
150 #else 151 #else
151 ConfigurationPolicyPrefStore* managed = NULL; 152 ConfigurationPolicyPrefStore* managed = NULL;
152 ConfigurationPolicyPrefStore* recommended = NULL; 153 ConfigurationPolicyPrefStore* recommended = NULL;
153 #endif // ENABLE_CONFIGURATION_POLICY 154 #endif // ENABLE_CONFIGURATION_POLICY
154 155
155 CommandLinePrefStore* command_line = 156 CommandLinePrefStore* command_line =
156 new CommandLinePrefStore(CommandLine::ForCurrentProcess()); 157 new CommandLinePrefStore(CommandLine::ForCurrentProcess());
157 JsonPrefStore* user = new JsonPrefStore( 158 JsonPrefStore* user = JsonPrefStore::Create(
158 pref_filename, 159 pref_filename,
159 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE)); 160 BrowserThread::GetBlockingPool());
160 DefaultPrefStore* default_pref_store = new DefaultPrefStore(); 161 DefaultPrefStore* default_pref_store = new DefaultPrefStore();
161 162
162 PrefNotifierImpl* pref_notifier = new PrefNotifierImpl(); 163 PrefNotifierImpl* pref_notifier = new PrefNotifierImpl();
163 PrefModelAssociator* pref_sync_associator = new PrefModelAssociator(); 164 PrefModelAssociator* pref_sync_associator = new PrefModelAssociator();
164 165
165 return new PrefService( 166 return new PrefService(
166 pref_notifier, 167 pref_notifier,
167 new PrefValueStore( 168 new PrefValueStore(
168 managed, 169 managed,
169 extension_prefs, 170 extension_prefs,
(...skipping 877 matching lines...) Expand 10 before | Expand all | Expand 10 after
1047 return pref_value_store()->PrefValueFromDefaultStore(name_.c_str()); 1048 return pref_value_store()->PrefValueFromDefaultStore(name_.c_str());
1048 } 1049 }
1049 1050
1050 bool PrefService::Preference::IsUserModifiable() const { 1051 bool PrefService::Preference::IsUserModifiable() const {
1051 return pref_value_store()->PrefValueUserModifiable(name_.c_str()); 1052 return pref_value_store()->PrefValueUserModifiable(name_.c_str());
1052 } 1053 }
1053 1054
1054 bool PrefService::Preference::IsExtensionModifiable() const { 1055 bool PrefService::Preference::IsExtensionModifiable() const {
1055 return pref_value_store()->PrefValueExtensionModifiable(name_.c_str()); 1056 return pref_value_store()->PrefValueExtensionModifiable(name_.c_str());
1056 } 1057 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698