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

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: Fixed nit from dbeam@, using new tracked preference deprecation. 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
« 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 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 PrefHashFilter::TRACKING_STRATEGY_ATOMIC 147 PrefHashFilter::TRACKING_STRATEGY_ATOMIC
148 }, 148 },
149 #if !defined(OS_ANDROID) 149 #if !defined(OS_ANDROID)
150 { 150 {
151 11, prefs::kPinnedTabs, 151 11, prefs::kPinnedTabs,
152 PrefHashFilter::ENFORCE_ON_LOAD, 152 PrefHashFilter::ENFORCE_ON_LOAD,
153 PrefHashFilter::TRACKING_STRATEGY_ATOMIC 153 PrefHashFilter::TRACKING_STRATEGY_ATOMIC
154 }, 154 },
155 #endif 155 #endif
156 { 156 {
157 13, prefs::kProfileResetPromptMemento,
158 PrefHashFilter::ENFORCE_ON_LOAD,
159 PrefHashFilter::TRACKING_STRATEGY_ATOMIC
160 },
161 {
162 14, DefaultSearchManager::kDefaultSearchProviderDataPrefName, 157 14, DefaultSearchManager::kDefaultSearchProviderDataPrefName,
163 PrefHashFilter::NO_ENFORCEMENT, 158 PrefHashFilter::NO_ENFORCEMENT,
164 PrefHashFilter::TRACKING_STRATEGY_ATOMIC 159 PrefHashFilter::TRACKING_STRATEGY_ATOMIC
165 }, 160 },
166 { 161 {
167 // Protecting kPreferenceResetTime does two things: 162 // Protecting kPreferenceResetTime does two things:
168 // 1) It ensures this isn't accidently set by someone stomping the pref 163 // 1) It ensures this isn't accidently set by someone stomping the pref
169 // file. 164 // file.
170 // 2) More importantly, it declares kPreferenceResetTime as a protected 165 // 2) More importantly, it declares kPreferenceResetTime as a protected
171 // pref which is required for it to be visible when queried via the 166 // pref which is required for it to be visible when queried via the
(...skipping 344 matching lines...) Expand 10 before | Expand all | Expand 10 after
516 511
517 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { 512 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
518 ProfilePrefStoreManager::RegisterProfilePrefs(registry); 513 ProfilePrefStoreManager::RegisterProfilePrefs(registry);
519 } 514 }
520 515
521 void RegisterPrefs(PrefRegistrySimple* registry) { 516 void RegisterPrefs(PrefRegistrySimple* registry) {
522 ProfilePrefStoreManager::RegisterPrefs(registry); 517 ProfilePrefStoreManager::RegisterPrefs(registry);
523 } 518 }
524 519
525 } // namespace chrome_prefs 520 } // 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