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

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

Issue 271673006: Eliminate all code related to the AutomaticProfileResetter. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Added hard deadline for removing migration code. Created 6 years, 4 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 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 #if defined(ENABLE_EXTENSIONS) 154 #if defined(ENABLE_EXTENSIONS)
155 { 155 {
156 // This pref has been deprecated, leave it here for now for it to be 156 // This pref has been deprecated, leave it here for now for it to be
157 // properly mapped back to Preferences and cleaned up from there. 157 // properly mapped back to Preferences and cleaned up from there.
158 12, extensions::pref_names::kKnownDisabled, 158 12, extensions::pref_names::kKnownDisabled,
159 PrefHashFilter::NO_ENFORCEMENT, 159 PrefHashFilter::NO_ENFORCEMENT,
160 PrefHashFilter::TRACKING_STRATEGY_ATOMIC 160 PrefHashFilter::TRACKING_STRATEGY_ATOMIC
161 }, 161 },
162 #endif 162 #endif
163 { 163 {
164 13, prefs::kProfileResetPromptMemento,
165 PrefHashFilter::ENFORCE_ON_LOAD,
166 PrefHashFilter::TRACKING_STRATEGY_ATOMIC
167 },
gab 2014/07/30 16:59:25 Leave this pref here as NO_ENFORCEMENT (see kKnown
engedy 2014/07/30 18:29:48 Done. Thanks!
168 {
169 14, DefaultSearchManager::kDefaultSearchProviderDataPrefName, 164 14, DefaultSearchManager::kDefaultSearchProviderDataPrefName,
170 PrefHashFilter::NO_ENFORCEMENT, 165 PrefHashFilter::NO_ENFORCEMENT,
171 PrefHashFilter::TRACKING_STRATEGY_ATOMIC 166 PrefHashFilter::TRACKING_STRATEGY_ATOMIC
172 }, 167 },
173 { 168 {
174 // Protecting kPreferenceResetTime does two things: 169 // Protecting kPreferenceResetTime does two things:
175 // 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
176 // file. 171 // file.
177 // 2) More importantly, it declares kPreferenceResetTime as a protected 172 // 2) More importantly, it declares kPreferenceResetTime as a protected
178 // pref which is required for it to be visible when queried via the 173 // pref which is required for it to be visible when queried via the
(...skipping 345 matching lines...) Expand 10 before | Expand all | Expand 10 after
524 519
525 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { 520 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
526 ProfilePrefStoreManager::RegisterProfilePrefs(registry); 521 ProfilePrefStoreManager::RegisterProfilePrefs(registry);
527 } 522 }
528 523
529 void RegisterPrefs(PrefRegistrySimple* registry) { 524 void RegisterPrefs(PrefRegistrySimple* registry) {
530 ProfilePrefStoreManager::RegisterPrefs(registry); 525 ProfilePrefStoreManager::RegisterPrefs(registry);
531 } 526 }
532 527
533 } // namespace chrome_prefs 528 } // namespace chrome_prefs
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698