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

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

Issue 24533002: Added the AutomaticProfileResetter service. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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 | Annotate | Revision Log
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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/browser_prefs.h" 5 #include "chrome/browser/prefs/browser_prefs.h"
6 6
7 #include "apps/prefs.h" 7 #include "apps/prefs.h"
8 #include "base/debug/trace_event.h" 8 #include "base/debug/trace_event.h"
9 #include "base/prefs/pref_registry_simple.h" 9 #include "base/prefs/pref_registry_simple.h"
10 #include "base/prefs/pref_service.h" 10 #include "base/prefs/pref_service.h"
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 #include "chrome/browser/extensions/default_apps.h" 152 #include "chrome/browser/extensions/default_apps.h"
153 #endif 153 #endif
154 154
155 #if defined(USE_ASH) 155 #if defined(USE_ASH)
156 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h" 156 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h"
157 #endif 157 #endif
158 158
159 #if defined(OS_ANDROID) 159 #if defined(OS_ANDROID)
160 #include "chrome/browser/ui/webui/ntp/android/promo_handler.h" 160 #include "chrome/browser/ui/webui/ntp/android/promo_handler.h"
161 #else 161 #else
162 #include "chrome/browser/profile_resetter/automatic_profile_resetter_factory.h"
162 #include "chrome/browser/ui/autofill/generated_credit_card_bubble_controller.h" 163 #include "chrome/browser/ui/autofill/generated_credit_card_bubble_controller.h"
163 #endif 164 #endif
164 165
165 #if defined(ENABLE_PLUGIN_INSTALLATION) 166 #if defined(ENABLE_PLUGIN_INSTALLATION)
166 #include "chrome/browser/plugins/plugins_resource_service.h" 167 #include "chrome/browser/plugins/plugins_resource_service.h"
167 #endif 168 #endif
168 169
169 namespace { 170 namespace {
170 171
171 enum MigratedPreferences { 172 enum MigratedPreferences {
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
248 TaskManager::RegisterPrefs(registry); 249 TaskManager::RegisterPrefs(registry);
249 #endif // defined(ENABLE_TASK_MANAGER) 250 #endif // defined(ENABLE_TASK_MANAGER)
250 251
251 #if defined(TOOLKIT_VIEWS) 252 #if defined(TOOLKIT_VIEWS)
252 RegisterBrowserViewPrefs(registry); 253 RegisterBrowserViewPrefs(registry);
253 RegisterTabStripLayoutTypePrefs(registry); 254 RegisterTabStripLayoutTypePrefs(registry);
254 #endif 255 #endif
255 256
256 #if !defined(OS_ANDROID) 257 #if !defined(OS_ANDROID)
257 BackgroundModeManager::RegisterPrefs(registry); 258 BackgroundModeManager::RegisterPrefs(registry);
259 profile_resetter::AutomaticProfileResetterFactory::RegisterPrefs(registry);
258 RegisterBrowserPrefs(registry); 260 RegisterBrowserPrefs(registry);
259 RegisterDefaultBrowserPromptPrefs(registry); 261 RegisterDefaultBrowserPromptPrefs(registry);
260 #endif 262 #endif
261 263
262 #if defined(OS_CHROMEOS) 264 #if defined(OS_CHROMEOS)
263 chromeos::AudioDevicesPrefHandlerImpl::RegisterPrefs(registry); 265 chromeos::AudioDevicesPrefHandlerImpl::RegisterPrefs(registry);
264 chromeos::DataPromoNotification::RegisterPrefs(registry); 266 chromeos::DataPromoNotification::RegisterPrefs(registry);
265 chromeos::DeviceOAuth2TokenService::RegisterPrefs(registry); 267 chromeos::DeviceOAuth2TokenService::RegisterPrefs(registry);
266 chromeos::device_settings_cache::RegisterPrefs(registry); 268 chromeos::device_settings_cache::RegisterPrefs(registry);
267 chromeos::default_pinned_apps_field_trial::RegisterPrefs(registry); 269 chromeos::default_pinned_apps_field_trial::RegisterPrefs(registry);
(...skipping 257 matching lines...) Expand 10 before | Expand all | Expand 10 after
525 } 527 }
526 local_state->ClearPref(prefs::kLastPromptedGoogleURL); 528 local_state->ClearPref(prefs::kLastPromptedGoogleURL);
527 529
528 current_version |= GOOGLE_URL_TRACKER_PREFS; 530 current_version |= GOOGLE_URL_TRACKER_PREFS;
529 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, 531 local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
530 current_version); 532 current_version);
531 } 533 }
532 } 534 }
533 535
534 } // namespace chrome 536 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698