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

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: Addressed comments, integrated Interpreter, added unit tests. 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 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 #include "chrome/browser/extensions/default_apps.h" 163 #include "chrome/browser/extensions/default_apps.h"
164 #endif 164 #endif
165 165
166 #if defined(USE_ASH) 166 #if defined(USE_ASH)
167 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h" 167 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h"
168 #endif 168 #endif
169 169
170 #if defined(OS_ANDROID) 170 #if defined(OS_ANDROID)
171 #include "chrome/browser/ui/webui/ntp/android/promo_handler.h" 171 #include "chrome/browser/ui/webui/ntp/android/promo_handler.h"
172 #else 172 #else
173 #include "chrome/browser/profile_resetter/automatic_profile_resetter_factory.h"
173 #include "chrome/browser/ui/autofill/generated_credit_card_bubble_controller.h" 174 #include "chrome/browser/ui/autofill/generated_credit_card_bubble_controller.h"
174 #endif 175 #endif
175 176
176 #if defined(ENABLE_PLUGIN_INSTALLATION) 177 #if defined(ENABLE_PLUGIN_INSTALLATION)
177 #include "chrome/browser/plugins/plugins_resource_service.h" 178 #include "chrome/browser/plugins/plugins_resource_service.h"
178 #endif 179 #endif
179 180
180 namespace { 181 namespace {
181 182
182 enum MigratedPreferences { 183 enum MigratedPreferences {
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
259 #if defined(ENABLE_TASK_MANAGER) 260 #if defined(ENABLE_TASK_MANAGER)
260 TaskManager::RegisterPrefs(registry); 261 TaskManager::RegisterPrefs(registry);
261 #endif // defined(ENABLE_TASK_MANAGER) 262 #endif // defined(ENABLE_TASK_MANAGER)
262 263
263 #if defined(TOOLKIT_VIEWS) 264 #if defined(TOOLKIT_VIEWS)
264 RegisterBrowserViewPrefs(registry); 265 RegisterBrowserViewPrefs(registry);
265 RegisterTabStripLayoutTypePrefs(registry); 266 RegisterTabStripLayoutTypePrefs(registry);
266 #endif 267 #endif
267 268
268 #if !defined(OS_ANDROID) 269 #if !defined(OS_ANDROID)
270 AutomaticProfileResetterFactory::RegisterPrefs(registry);
269 BackgroundModeManager::RegisterPrefs(registry); 271 BackgroundModeManager::RegisterPrefs(registry);
270 RegisterBrowserPrefs(registry); 272 RegisterBrowserPrefs(registry);
271 #if !defined(OS_CHROMEOS) 273 #if !defined(OS_CHROMEOS)
272 RegisterDefaultBrowserPromptPrefs(registry); 274 RegisterDefaultBrowserPromptPrefs(registry);
273 #endif // !defined(OS_CHROMEOS) 275 #endif // !defined(OS_CHROMEOS)
274 #endif // !defined(OS_ANDROID) 276 #endif // !defined(OS_ANDROID)
275 277
276 #if defined(OS_CHROMEOS) 278 #if defined(OS_CHROMEOS)
277 chromeos::AudioDevicesPrefHandlerImpl::RegisterPrefs(registry); 279 chromeos::AudioDevicesPrefHandlerImpl::RegisterPrefs(registry);
278 chromeos::DataPromoNotification::RegisterPrefs(registry); 280 chromeos::DataPromoNotification::RegisterPrefs(registry);
(...skipping 275 matching lines...) Expand 10 before | Expand all | Expand 10 after
554 } 556 }
555 local_state->ClearPref(prefs::kLastPromptedGoogleURL); 557 local_state->ClearPref(prefs::kLastPromptedGoogleURL);
556 558
557 current_version |= GOOGLE_URL_TRACKER_PREFS; 559 current_version |= GOOGLE_URL_TRACKER_PREFS;
558 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, 560 local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
559 current_version); 561 current_version);
560 } 562 }
561 } 563 }
562 564
563 } // namespace chrome 565 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698