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

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

Issue 533183002: Revert "Eliminate all code related to the AutomaticProfileResetter." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 6 years, 3 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
« no previous file with comments | « chrome/browser/prefs/browser_prefs.cc ('k') | chrome/browser/prefs/pref_hash_filter.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 10, prefs::kDefaultSearchProviderName, 146 10, prefs::kDefaultSearchProviderName,
147 PrefHashFilter::ENFORCE_ON_LOAD, 147 PrefHashFilter::ENFORCE_ON_LOAD,
148 PrefHashFilter::TRACKING_STRATEGY_ATOMIC 148 PrefHashFilter::TRACKING_STRATEGY_ATOMIC
149 }, 149 },
150 #if !defined(OS_ANDROID) 150 #if !defined(OS_ANDROID)
151 { 151 {
152 11, prefs::kPinnedTabs, 152 11, prefs::kPinnedTabs,
153 PrefHashFilter::ENFORCE_ON_LOAD, 153 PrefHashFilter::ENFORCE_ON_LOAD,
154 PrefHashFilter::TRACKING_STRATEGY_ATOMIC 154 PrefHashFilter::TRACKING_STRATEGY_ATOMIC
155 }, 155 },
156 {
157 13, prefs::kProfileResetPromptMementoInProfilePrefs,
158 PrefHashFilter::ENFORCE_ON_LOAD,
159 PrefHashFilter::TRACKING_STRATEGY_ATOMIC
160 },
156 #endif 161 #endif
157 { 162 {
158 14, DefaultSearchManager::kDefaultSearchProviderDataPrefName, 163 14, DefaultSearchManager::kDefaultSearchProviderDataPrefName,
159 PrefHashFilter::NO_ENFORCEMENT, 164 PrefHashFilter::NO_ENFORCEMENT,
160 PrefHashFilter::TRACKING_STRATEGY_ATOMIC 165 PrefHashFilter::TRACKING_STRATEGY_ATOMIC
161 }, 166 },
162 { 167 {
163 // Protecting kPreferenceResetTime does two things: 168 // Protecting kPreferenceResetTime does two things:
164 // 1) It ensures this isn't accidently set by someone stomping the pref 169 // 1) It ensures this isn't accidently set by someone stomping the pref
165 // file. 170 // file.
(...skipping 362 matching lines...) Expand 10 before | Expand all | Expand 10 after
528 533
529 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { 534 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
530 ProfilePrefStoreManager::RegisterProfilePrefs(registry); 535 ProfilePrefStoreManager::RegisterProfilePrefs(registry);
531 } 536 }
532 537
533 void RegisterPrefs(PrefRegistrySimple* registry) { 538 void RegisterPrefs(PrefRegistrySimple* registry) {
534 ProfilePrefStoreManager::RegisterPrefs(registry); 539 ProfilePrefStoreManager::RegisterPrefs(registry);
535 } 540 }
536 541
537 } // namespace chrome_prefs 542 } // namespace chrome_prefs
OLDNEW
« no previous file with comments | « chrome/browser/prefs/browser_prefs.cc ('k') | chrome/browser/prefs/pref_hash_filter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698