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

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

Issue 271673006: Eliminate all code related to the AutomaticProfileResetter. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase, removes prefs as well. 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
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 <string> 7 #include <string>
8 8
9 #include "base/debug/trace_event.h" 9 #include "base/debug/trace_event.h"
10 #include "base/prefs/pref_registry_simple.h" 10 #include "base/prefs/pref_registry_simple.h"
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 129
130 #if defined(ENABLE_PLUGIN_INSTALLATION) 130 #if defined(ENABLE_PLUGIN_INSTALLATION)
131 #include "chrome/browser/plugins/plugins_resource_service.h" 131 #include "chrome/browser/plugins/plugins_resource_service.h"
132 #endif 132 #endif
133 133
134 #if defined(OS_ANDROID) 134 #if defined(OS_ANDROID)
135 #include "chrome/browser/android/bookmarks/partner_bookmarks_shim.h" 135 #include "chrome/browser/android/bookmarks/partner_bookmarks_shim.h"
136 #include "chrome/browser/android/new_tab_page_prefs.h" 136 #include "chrome/browser/android/new_tab_page_prefs.h"
137 #else 137 #else
138 #include "chrome/browser/notifications/sync_notifier/chrome_notifier_service.h" 138 #include "chrome/browser/notifications/sync_notifier/chrome_notifier_service.h"
139 #include "chrome/browser/profile_resetter/automatic_profile_resetter_factory.h"
140 #include "chrome/browser/ui/autofill/generated_credit_card_bubble_controller.h" 139 #include "chrome/browser/ui/autofill/generated_credit_card_bubble_controller.h"
141 #endif 140 #endif
142 141
143 #if defined(OS_CHROMEOS) 142 #if defined(OS_CHROMEOS)
144 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" 143 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"
145 #include "chrome/browser/chromeos/attestation/platform_verification_flow.h" 144 #include "chrome/browser/chromeos/attestation/platform_verification_flow.h"
146 #include "chrome/browser/chromeos/audio/audio_devices_pref_handler_impl.h" 145 #include "chrome/browser/chromeos/audio/audio_devices_pref_handler_impl.h"
147 #include "chrome/browser/chromeos/customization_document.h" 146 #include "chrome/browser/chromeos/customization_document.h"
148 #include "chrome/browser/chromeos/display/display_preferences.h" 147 #include "chrome/browser/chromeos/display/display_preferences.h"
149 #include "chrome/browser/chromeos/extensions/echo_private_api.h" 148 #include "chrome/browser/chromeos/extensions/echo_private_api.h"
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
279 278
280 #if defined(ENABLE_PLUGIN_INSTALLATION) 279 #if defined(ENABLE_PLUGIN_INSTALLATION)
281 PluginsResourceService::RegisterPrefs(registry); 280 PluginsResourceService::RegisterPrefs(registry);
282 #endif 281 #endif
283 282
284 #if defined(ENABLE_TASK_MANAGER) 283 #if defined(ENABLE_TASK_MANAGER)
285 TaskManager::RegisterPrefs(registry); 284 TaskManager::RegisterPrefs(registry);
286 #endif // defined(ENABLE_TASK_MANAGER) 285 #endif // defined(ENABLE_TASK_MANAGER)
287 286
288 #if !defined(OS_ANDROID) 287 #if !defined(OS_ANDROID)
289 AutomaticProfileResetterFactory::RegisterPrefs(registry);
290 BackgroundModeManager::RegisterPrefs(registry); 288 BackgroundModeManager::RegisterPrefs(registry);
291 RegisterBrowserPrefs(registry); 289 RegisterBrowserPrefs(registry);
292 #if !defined(OS_CHROMEOS) 290 #if !defined(OS_CHROMEOS)
293 RegisterDefaultBrowserPromptPrefs(registry); 291 RegisterDefaultBrowserPromptPrefs(registry);
294 #endif // !defined(OS_CHROMEOS) 292 #endif // !defined(OS_CHROMEOS)
295 #endif // !defined(OS_ANDROID) 293 #endif // !defined(OS_ANDROID)
296 294
297 #if defined(OS_CHROMEOS) 295 #if defined(OS_CHROMEOS)
298 ChromeOSMetricsProvider::RegisterPrefs(registry); 296 ChromeOSMetricsProvider::RegisterPrefs(registry);
299 chromeos::AudioDevicesPrefHandlerImpl::RegisterPrefs(registry); 297 chromeos::AudioDevicesPrefHandlerImpl::RegisterPrefs(registry);
(...skipping 293 matching lines...) Expand 10 before | Expand all | Expand 10 after
593 #if defined(OS_CHROMEOS) 591 #if defined(OS_CHROMEOS)
594 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); 592 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state);
595 #endif 593 #endif
596 594
597 #if defined(TOOLKIT_VIEWS) 595 #if defined(TOOLKIT_VIEWS)
598 MigrateBrowserTabStripPrefs(local_state); 596 MigrateBrowserTabStripPrefs(local_state);
599 #endif 597 #endif
600 } 598 }
601 599
602 } // namespace chrome 600 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698