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

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

Issue 383903003: ifdef various extensions code to be used only when extensions are enabled. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix build Created 6 years, 5 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/chrome_pref_service_factory.h" 5 #include "chrome/browser/prefs/chrome_pref_service_factory.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 25 matching lines...) Expand all
36 #include "chrome/browser/search_engines/default_search_pref_migration.h" 36 #include "chrome/browser/search_engines/default_search_pref_migration.h"
37 #include "chrome/browser/ui/profile_error_dialog.h" 37 #include "chrome/browser/ui/profile_error_dialog.h"
38 #include "chrome/common/chrome_constants.h" 38 #include "chrome/common/chrome_constants.h"
39 #include "chrome/common/pref_names.h" 39 #include "chrome/common/pref_names.h"
40 #include "components/pref_registry/pref_registry_syncable.h" 40 #include "components/pref_registry/pref_registry_syncable.h"
41 #include "components/search_engines/default_search_manager.h" 41 #include "components/search_engines/default_search_manager.h"
42 #include "components/search_engines/search_engines_pref_names.h" 42 #include "components/search_engines/search_engines_pref_names.h"
43 #include "components/sync_driver/pref_names.h" 43 #include "components/sync_driver/pref_names.h"
44 #include "content/public/browser/browser_context.h" 44 #include "content/public/browser/browser_context.h"
45 #include "content/public/browser/browser_thread.h" 45 #include "content/public/browser/browser_thread.h"
46 #include "extensions/browser/pref_names.h"
47 #include "grit/browser_resources.h" 46 #include "grit/browser_resources.h"
48 #include "grit/chromium_strings.h" 47 #include "grit/chromium_strings.h"
49 #include "grit/generated_resources.h" 48 #include "grit/generated_resources.h"
50 #include "ui/base/resource/resource_bundle.h" 49 #include "ui/base/resource/resource_bundle.h"
51 50
52 #if defined(ENABLE_CONFIGURATION_POLICY) 51 #if defined(ENABLE_CONFIGURATION_POLICY)
53 #include "components/policy/core/browser/browser_policy_connector.h" 52 #include "components/policy/core/browser/browser_policy_connector.h"
54 #include "components/policy/core/browser/configuration_policy_pref_store.h" 53 #include "components/policy/core/browser/configuration_policy_pref_store.h"
55 #include "components/policy/core/common/policy_types.h" 54 #include "components/policy/core/common/policy_types.h"
56 #endif 55 #endif
57 56
57 #if defined(ENABLE_EXTENSIONS)
58 #include "extensions/browser/pref_names.h"
59 #endif
60
58 #if defined(ENABLE_MANAGED_USERS) 61 #if defined(ENABLE_MANAGED_USERS)
59 #include "chrome/browser/supervised_user/supervised_user_pref_store.h" 62 #include "chrome/browser/supervised_user/supervised_user_pref_store.h"
60 #endif 63 #endif
61 64
62 #if defined(OS_WIN) 65 #if defined(OS_WIN)
63 #include "base/win/win_util.h" 66 #include "base/win/win_util.h"
64 #if defined(ENABLE_RLZ) 67 #if defined(ENABLE_RLZ)
65 #include "rlz/lib/machine_id.h" 68 #include "rlz/lib/machine_id.h"
66 #endif // defined(ENABLE_RLZ) 69 #endif // defined(ENABLE_RLZ)
67 #endif // defined(OS_WIN) 70 #endif // defined(OS_WIN)
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 { 103 {
101 3, prefs::kRestoreOnStartup, 104 3, prefs::kRestoreOnStartup,
102 PrefHashFilter::ENFORCE_ON_LOAD, 105 PrefHashFilter::ENFORCE_ON_LOAD,
103 PrefHashFilter::TRACKING_STRATEGY_ATOMIC 106 PrefHashFilter::TRACKING_STRATEGY_ATOMIC
104 }, 107 },
105 { 108 {
106 4, prefs::kURLsToRestoreOnStartup, 109 4, prefs::kURLsToRestoreOnStartup,
107 PrefHashFilter::ENFORCE_ON_LOAD, 110 PrefHashFilter::ENFORCE_ON_LOAD,
108 PrefHashFilter::TRACKING_STRATEGY_ATOMIC 111 PrefHashFilter::TRACKING_STRATEGY_ATOMIC
109 }, 112 },
113 #if defined(ENABLE_EXTENSIONS)
110 { 114 {
111 5, extensions::pref_names::kExtensions, 115 5, extensions::pref_names::kExtensions,
112 PrefHashFilter::NO_ENFORCEMENT, 116 PrefHashFilter::NO_ENFORCEMENT,
113 PrefHashFilter::TRACKING_STRATEGY_SPLIT 117 PrefHashFilter::TRACKING_STRATEGY_SPLIT
114 }, 118 },
119 #endif
115 { 120 {
116 6, prefs::kGoogleServicesLastUsername, 121 6, prefs::kGoogleServicesLastUsername,
117 PrefHashFilter::ENFORCE_ON_LOAD, 122 PrefHashFilter::ENFORCE_ON_LOAD,
118 PrefHashFilter::TRACKING_STRATEGY_ATOMIC 123 PrefHashFilter::TRACKING_STRATEGY_ATOMIC
119 }, 124 },
120 { 125 {
121 7, prefs::kSearchProviderOverrides, 126 7, prefs::kSearchProviderOverrides,
122 PrefHashFilter::ENFORCE_ON_LOAD, 127 PrefHashFilter::ENFORCE_ON_LOAD,
123 PrefHashFilter::TRACKING_STRATEGY_ATOMIC 128 PrefHashFilter::TRACKING_STRATEGY_ATOMIC
124 }, 129 },
(...skipping 12 matching lines...) Expand all
137 PrefHashFilter::ENFORCE_ON_LOAD, 142 PrefHashFilter::ENFORCE_ON_LOAD,
138 PrefHashFilter::TRACKING_STRATEGY_ATOMIC 143 PrefHashFilter::TRACKING_STRATEGY_ATOMIC
139 }, 144 },
140 #if !defined(OS_ANDROID) 145 #if !defined(OS_ANDROID)
141 { 146 {
142 11, prefs::kPinnedTabs, 147 11, prefs::kPinnedTabs,
143 PrefHashFilter::ENFORCE_ON_LOAD, 148 PrefHashFilter::ENFORCE_ON_LOAD,
144 PrefHashFilter::TRACKING_STRATEGY_ATOMIC 149 PrefHashFilter::TRACKING_STRATEGY_ATOMIC
145 }, 150 },
146 #endif 151 #endif
152 #if defined(ENABLE_EXTENSIONS)
147 { 153 {
148 // This pref has been deprecated, leave it here for now for it to be 154 // This pref has been deprecated, leave it here for now for it to be
149 // properly mapped back to Preferences and cleaned up from there. 155 // properly mapped back to Preferences and cleaned up from there.
150 12, extensions::pref_names::kKnownDisabled, 156 12, extensions::pref_names::kKnownDisabled,
151 PrefHashFilter::NO_ENFORCEMENT, 157 PrefHashFilter::NO_ENFORCEMENT,
152 PrefHashFilter::TRACKING_STRATEGY_ATOMIC 158 PrefHashFilter::TRACKING_STRATEGY_ATOMIC
153 }, 159 },
160 #endif
154 { 161 {
155 13, prefs::kProfileResetPromptMemento, 162 13, prefs::kProfileResetPromptMemento,
156 PrefHashFilter::ENFORCE_ON_LOAD, 163 PrefHashFilter::ENFORCE_ON_LOAD,
157 PrefHashFilter::TRACKING_STRATEGY_ATOMIC 164 PrefHashFilter::TRACKING_STRATEGY_ATOMIC
158 }, 165 },
159 { 166 {
160 14, DefaultSearchManager::kDefaultSearchProviderDataPrefName, 167 14, DefaultSearchManager::kDefaultSearchProviderDataPrefName,
161 PrefHashFilter::NO_ENFORCEMENT, 168 PrefHashFilter::NO_ENFORCEMENT,
162 PrefHashFilter::TRACKING_STRATEGY_ATOMIC 169 PrefHashFilter::TRACKING_STRATEGY_ATOMIC
163 }, 170 },
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
285 // Remove enforcement for all tracked preferences. 292 // Remove enforcement for all tracked preferences.
286 data.enforcement_level = PrefHashFilter::NO_ENFORCEMENT; 293 data.enforcement_level = PrefHashFilter::NO_ENFORCEMENT;
287 } 294 }
288 295
289 if (enforcement_group >= GROUP_ENFORCE_ALWAYS_WITH_DSE && 296 if (enforcement_group >= GROUP_ENFORCE_ALWAYS_WITH_DSE &&
290 data.name == DefaultSearchManager::kDefaultSearchProviderDataPrefName) { 297 data.name == DefaultSearchManager::kDefaultSearchProviderDataPrefName) {
291 // Specifically enable default search settings enforcement. 298 // Specifically enable default search settings enforcement.
292 data.enforcement_level = PrefHashFilter::ENFORCE_ON_LOAD; 299 data.enforcement_level = PrefHashFilter::ENFORCE_ON_LOAD;
293 } 300 }
294 301
302 #if defined(ENABLE_EXTENSIONS)
295 if (enforcement_group >= GROUP_ENFORCE_ALWAYS_WITH_EXTENSIONS_AND_DSE && 303 if (enforcement_group >= GROUP_ENFORCE_ALWAYS_WITH_EXTENSIONS_AND_DSE &&
296 data.name == extensions::pref_names::kExtensions) { 304 data.name == extensions::pref_names::kExtensions) {
297 // Specifically enable extension settings enforcement. 305 // Specifically enable extension settings enforcement.
298 data.enforcement_level = PrefHashFilter::ENFORCE_ON_LOAD; 306 data.enforcement_level = PrefHashFilter::ENFORCE_ON_LOAD;
299 } 307 }
308 #endif
300 309
301 result.push_back(data); 310 result.push_back(data);
302 } 311 }
303 return result; 312 return result;
304 } 313 }
305 314
306 315
307 // Shows notifications which correspond to PersistentPrefStore's reading errors. 316 // Shows notifications which correspond to PersistentPrefStore's reading errors.
308 void HandleReadError(PersistentPrefStore::PrefReadError error) { 317 void HandleReadError(PersistentPrefStore::PrefReadError error) {
309 // Sample the histogram also for the successful case in order to get a 318 // Sample the histogram also for the successful case in order to get a
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
496 505
497 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { 506 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
498 ProfilePrefStoreManager::RegisterProfilePrefs(registry); 507 ProfilePrefStoreManager::RegisterProfilePrefs(registry);
499 } 508 }
500 509
501 void RegisterPrefs(PrefRegistrySimple* registry) { 510 void RegisterPrefs(PrefRegistrySimple* registry) {
502 ProfilePrefStoreManager::RegisterPrefs(registry); 511 ProfilePrefStoreManager::RegisterPrefs(registry);
503 } 512 }
504 513
505 } // namespace chrome_prefs 514 } // namespace chrome_prefs
OLDNEW
« no previous file with comments | « chrome/browser/policy/configuration_policy_handler_list_factory.cc ('k') | chrome/browser/ui/tab_helpers.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698