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

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: Final touches on unittests. Created 7 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 | 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 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 #include "chrome/browser/extensions/default_apps.h" 165 #include "chrome/browser/extensions/default_apps.h"
166 #endif 166 #endif
167 167
168 #if defined(USE_ASH) 168 #if defined(USE_ASH)
169 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h" 169 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h"
170 #endif 170 #endif
171 171
172 #if defined(OS_ANDROID) 172 #if defined(OS_ANDROID)
173 #include "chrome/browser/ui/webui/ntp/android/promo_handler.h" 173 #include "chrome/browser/ui/webui/ntp/android/promo_handler.h"
174 #else 174 #else
175 #include "chrome/browser/profile_resetter/automatic_profile_resetter_factory.h"
175 #include "chrome/browser/ui/autofill/generated_credit_card_bubble_controller.h" 176 #include "chrome/browser/ui/autofill/generated_credit_card_bubble_controller.h"
176 #endif 177 #endif
177 178
178 #if defined(ENABLE_PLUGIN_INSTALLATION) 179 #if defined(ENABLE_PLUGIN_INSTALLATION)
179 #include "chrome/browser/plugins/plugins_resource_service.h" 180 #include "chrome/browser/plugins/plugins_resource_service.h"
180 #endif 181 #endif
181 182
182 namespace { 183 namespace {
183 184
184 enum MigratedPreferences { 185 enum MigratedPreferences {
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
261 #if defined(ENABLE_TASK_MANAGER) 262 #if defined(ENABLE_TASK_MANAGER)
262 TaskManager::RegisterPrefs(registry); 263 TaskManager::RegisterPrefs(registry);
263 #endif // defined(ENABLE_TASK_MANAGER) 264 #endif // defined(ENABLE_TASK_MANAGER)
264 265
265 #if defined(TOOLKIT_VIEWS) 266 #if defined(TOOLKIT_VIEWS)
266 RegisterBrowserViewPrefs(registry); 267 RegisterBrowserViewPrefs(registry);
267 RegisterTabStripLayoutTypePrefs(registry); 268 RegisterTabStripLayoutTypePrefs(registry);
268 #endif 269 #endif
269 270
270 #if !defined(OS_ANDROID) 271 #if !defined(OS_ANDROID)
272 AutomaticProfileResetterFactory::RegisterPrefs(registry);
271 BackgroundModeManager::RegisterPrefs(registry); 273 BackgroundModeManager::RegisterPrefs(registry);
272 RegisterBrowserPrefs(registry); 274 RegisterBrowserPrefs(registry);
273 #if !defined(OS_CHROMEOS) 275 #if !defined(OS_CHROMEOS)
274 RegisterDefaultBrowserPromptPrefs(registry); 276 RegisterDefaultBrowserPromptPrefs(registry);
275 #endif // !defined(OS_CHROMEOS) 277 #endif // !defined(OS_CHROMEOS)
276 #endif // !defined(OS_ANDROID) 278 #endif // !defined(OS_ANDROID)
277 279
278 #if defined(OS_CHROMEOS) 280 #if defined(OS_CHROMEOS)
279 chromeos::AudioDevicesPrefHandlerImpl::RegisterPrefs(registry); 281 chromeos::AudioDevicesPrefHandlerImpl::RegisterPrefs(registry);
280 chromeos::DataPromoNotification::RegisterPrefs(registry); 282 chromeos::DataPromoNotification::RegisterPrefs(registry);
(...skipping 279 matching lines...) Expand 10 before | Expand all | Expand 10 after
560 } 562 }
561 local_state->ClearPref(prefs::kLastPromptedGoogleURL); 563 local_state->ClearPref(prefs::kLastPromptedGoogleURL);
562 564
563 current_version |= GOOGLE_URL_TRACKER_PREFS; 565 current_version |= GOOGLE_URL_TRACKER_PREFS;
564 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, 566 local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
565 current_version); 567 current_version);
566 } 568 }
567 } 569 }
568 570
569 } // namespace chrome 571 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698