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

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

Issue 599653002: SRT Bubble (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Merged in ToT. Created 6 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
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 23 matching lines...) Expand all
34 #include "chrome/browser/prefs/profile_pref_store_manager.h" 34 #include "chrome/browser/prefs/profile_pref_store_manager.h"
35 #include "chrome/browser/profiles/file_path_verifier_win.h" 35 #include "chrome/browser/profiles/file_path_verifier_win.h"
36 #include "chrome/browser/profiles/profile.h" 36 #include "chrome/browser/profiles/profile.h"
37 #include "chrome/browser/search_engines/default_search_pref_migration.h" 37 #include "chrome/browser/search_engines/default_search_pref_migration.h"
38 #include "chrome/browser/sync/glue/sync_start_util.h" 38 #include "chrome/browser/sync/glue/sync_start_util.h"
39 #include "chrome/browser/ui/profile_error_dialog.h" 39 #include "chrome/browser/ui/profile_error_dialog.h"
40 #include "chrome/common/chrome_constants.h" 40 #include "chrome/common/chrome_constants.h"
41 #include "chrome/common/pref_names.h" 41 #include "chrome/common/pref_names.h"
42 #include "chrome/grit/chromium_strings.h" 42 #include "chrome/grit/chromium_strings.h"
43 #include "chrome/grit/generated_resources.h" 43 #include "chrome/grit/generated_resources.h"
44 #include "components/component_updater/pref_names.h"
44 #include "components/pref_registry/pref_registry_syncable.h" 45 #include "components/pref_registry/pref_registry_syncable.h"
45 #include "components/search_engines/default_search_manager.h" 46 #include "components/search_engines/default_search_manager.h"
46 #include "components/search_engines/search_engines_pref_names.h" 47 #include "components/search_engines/search_engines_pref_names.h"
47 #include "components/sync_driver/pref_names.h" 48 #include "components/sync_driver/pref_names.h"
48 #include "content/public/browser/browser_context.h" 49 #include "content/public/browser/browser_context.h"
49 #include "content/public/browser/browser_thread.h" 50 #include "content/public/browser/browser_thread.h"
50 #include "grit/browser_resources.h" 51 #include "grit/browser_resources.h"
51 #include "sync/internal_api/public/base/model_type.h" 52 #include "sync/internal_api/public/base/model_type.h"
52 #include "ui/base/resource/resource_bundle.h" 53 #include "ui/base/resource/resource_bundle.h"
53 54
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 PrefHashFilter::ENFORCE_ON_LOAD, 148 PrefHashFilter::ENFORCE_ON_LOAD,
148 PrefHashFilter::TRACKING_STRATEGY_ATOMIC 149 PrefHashFilter::TRACKING_STRATEGY_ATOMIC
149 }, 150 },
150 #if !defined(OS_ANDROID) 151 #if !defined(OS_ANDROID)
151 { 152 {
152 11, prefs::kPinnedTabs, 153 11, prefs::kPinnedTabs,
153 PrefHashFilter::ENFORCE_ON_LOAD, 154 PrefHashFilter::ENFORCE_ON_LOAD,
154 PrefHashFilter::TRACKING_STRATEGY_ATOMIC 155 PrefHashFilter::TRACKING_STRATEGY_ATOMIC
155 }, 156 },
156 { 157 {
157 13, prefs::kProfileResetPromptMementoInProfilePrefs, 158 13, prefs::kProfileResetPromptMementoInProfilePrefs,
158 PrefHashFilter::ENFORCE_ON_LOAD, 159 PrefHashFilter::ENFORCE_ON_LOAD,
159 PrefHashFilter::TRACKING_STRATEGY_ATOMIC 160 PrefHashFilter::TRACKING_STRATEGY_ATOMIC
160 }, 161 },
161 #endif 162 #endif
162 { 163 {
163 14, DefaultSearchManager::kDefaultSearchProviderDataPrefName, 164 14, DefaultSearchManager::kDefaultSearchProviderDataPrefName,
164 PrefHashFilter::NO_ENFORCEMENT, 165 PrefHashFilter::NO_ENFORCEMENT,
165 PrefHashFilter::TRACKING_STRATEGY_ATOMIC 166 PrefHashFilter::TRACKING_STRATEGY_ATOMIC
166 }, 167 },
167 { 168 {
168 // Protecting kPreferenceResetTime does two things: 169 // Protecting kPreferenceResetTime does two things:
169 // 1) It ensures this isn't accidently set by someone stomping the pref 170 // 1) It ensures this isn't accidently set by someone stomping the pref
(...skipping 17 matching lines...) Expand all
187 { 188 {
188 17, sync_driver::prefs::kSyncRemainingRollbackTries, 189 17, sync_driver::prefs::kSyncRemainingRollbackTries,
189 PrefHashFilter::ENFORCE_ON_LOAD, 190 PrefHashFilter::ENFORCE_ON_LOAD,
190 PrefHashFilter::TRACKING_STRATEGY_ATOMIC 191 PrefHashFilter::TRACKING_STRATEGY_ATOMIC
191 }, 192 },
192 { 193 {
193 18, prefs::kSafeBrowsingIncidentsSent, 194 18, prefs::kSafeBrowsingIncidentsSent,
194 PrefHashFilter::ENFORCE_ON_LOAD, 195 PrefHashFilter::ENFORCE_ON_LOAD,
195 PrefHashFilter::TRACKING_STRATEGY_ATOMIC 196 PrefHashFilter::TRACKING_STRATEGY_ATOMIC
196 }, 197 },
198 #if defined(OS_WIN)
199 {
200 19, prefs::kSwReporterPromptVersion,
201 PrefHashFilter::ENFORCE_ON_LOAD,
202 PrefHashFilter::TRACKING_STRATEGY_ATOMIC
203 },
204 {
205 20, prefs::kSwReporterPromptReason,
206 PrefHashFilter::ENFORCE_ON_LOAD,
207 PrefHashFilter::TRACKING_STRATEGY_ATOMIC
208 },
209 #endif
197 }; 210 };
198 211
199 // One more than the last tracked preferences ID above. 212 // One more than the last tracked preferences ID above.
200 const size_t kTrackedPrefsReportingIDsCount = 213 const size_t kTrackedPrefsReportingIDsCount =
201 kTrackedPrefs[arraysize(kTrackedPrefs) - 1].reporting_id + 1; 214 kTrackedPrefs[arraysize(kTrackedPrefs) - 1].reporting_id + 1;
202 215
203 // Each group enforces a superset of the protection provided by the previous 216 // Each group enforces a superset of the protection provided by the previous
204 // one. 217 // one.
205 enum SettingsEnforcementGroup { 218 enum SettingsEnforcementGroup {
206 GROUP_NO_ENFORCEMENT, 219 GROUP_NO_ENFORCEMENT,
(...skipping 326 matching lines...) Expand 10 before | Expand all | Expand 10 after
533 546
534 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { 547 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
535 ProfilePrefStoreManager::RegisterProfilePrefs(registry); 548 ProfilePrefStoreManager::RegisterProfilePrefs(registry);
536 } 549 }
537 550
538 void RegisterPrefs(PrefRegistrySimple* registry) { 551 void RegisterPrefs(PrefRegistrySimple* registry) {
539 ProfilePrefStoreManager::RegisterPrefs(registry); 552 ProfilePrefStoreManager::RegisterPrefs(registry);
540 } 553 }
541 554
542 } // namespace chrome_prefs 555 } // namespace chrome_prefs
OLDNEW
« no previous file with comments | « chrome/browser/prefs/browser_prefs.cc ('k') | chrome/browser/safe_browsing/srt_global_error_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698