| OLD | NEW |
| 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/metrics/histogram.h" | 10 #include "base/metrics/histogram.h" |
| (...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 184 #include "chrome/browser/chromeos/system/automatic_reboot_manager.h" | 184 #include "chrome/browser/chromeos/system/automatic_reboot_manager.h" |
| 185 #include "chrome/browser/extensions/api/enterprise_platform_keys_private/enterpr
ise_platform_keys_private_api.h" | 185 #include "chrome/browser/extensions/api/enterprise_platform_keys_private/enterpr
ise_platform_keys_private_api.h" |
| 186 #include "chrome/browser/extensions/extension_assets_manager_chromeos.h" | 186 #include "chrome/browser/extensions/extension_assets_manager_chromeos.h" |
| 187 #include "chrome/browser/metrics/chromeos_metrics_provider.h" | 187 #include "chrome/browser/metrics/chromeos_metrics_provider.h" |
| 188 #include "chrome/browser/ui/webui/chromeos/login/demo_mode_detector.h" | 188 #include "chrome/browser/ui/webui/chromeos/login/demo_mode_detector.h" |
| 189 #include "chrome/browser/ui/webui/chromeos/login/enable_debugging_screen_handler
.h" | 189 #include "chrome/browser/ui/webui/chromeos/login/enable_debugging_screen_handler
.h" |
| 190 #include "chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.h" | 190 #include "chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.h" |
| 191 #include "chrome/browser/ui/webui/chromeos/login/reset_screen_handler.h" | 191 #include "chrome/browser/ui/webui/chromeos/login/reset_screen_handler.h" |
| 192 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" | 192 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" |
| 193 #include "chromeos/audio/audio_devices_pref_handler_impl.h" | 193 #include "chromeos/audio/audio_devices_pref_handler_impl.h" |
| 194 #include "chromeos/timezone/timezone_resolver.h" |
| 194 #include "components/invalidation/invalidator_storage.h" | 195 #include "components/invalidation/invalidator_storage.h" |
| 195 #else | 196 #else |
| 196 #include "chrome/browser/extensions/default_apps.h" | 197 #include "chrome/browser/extensions/default_apps.h" |
| 197 #endif | 198 #endif |
| 198 | 199 |
| 199 #if defined(OS_MACOSX) | 200 #if defined(OS_MACOSX) |
| 200 #include "chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.h" | 201 #include "chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.h" |
| 201 #include "chrome/browser/ui/cocoa/confirm_quit.h" | 202 #include "chrome/browser/ui/cocoa/confirm_quit.h" |
| 202 #endif | 203 #endif |
| 203 | 204 |
| (...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 352 #endif | 353 #endif |
| 353 chromeos::echo_offer::RegisterPrefs(registry); | 354 chromeos::echo_offer::RegisterPrefs(registry); |
| 354 extensions::ExtensionAssetsManagerChromeOS::RegisterPrefs(registry); | 355 extensions::ExtensionAssetsManagerChromeOS::RegisterPrefs(registry); |
| 355 invalidation::InvalidatorStorage::RegisterPrefs(registry); | 356 invalidation::InvalidatorStorage::RegisterPrefs(registry); |
| 356 policy::AutoEnrollmentClient::RegisterPrefs(registry); | 357 policy::AutoEnrollmentClient::RegisterPrefs(registry); |
| 357 policy::BrowserPolicyConnectorChromeOS::RegisterPrefs(registry); | 358 policy::BrowserPolicyConnectorChromeOS::RegisterPrefs(registry); |
| 358 policy::ConsumerManagementService::RegisterPrefs(registry); | 359 policy::ConsumerManagementService::RegisterPrefs(registry); |
| 359 policy::DeviceCloudPolicyManagerChromeOS::RegisterPrefs(registry); | 360 policy::DeviceCloudPolicyManagerChromeOS::RegisterPrefs(registry); |
| 360 policy::DeviceStatusCollector::RegisterPrefs(registry); | 361 policy::DeviceStatusCollector::RegisterPrefs(registry); |
| 361 policy::PolicyCertServiceFactory::RegisterPrefs(registry); | 362 policy::PolicyCertServiceFactory::RegisterPrefs(registry); |
| 363 chromeos::TimeZoneResolver::RegisterPrefs(registry); |
| 362 #endif | 364 #endif |
| 363 | 365 |
| 364 #if defined(OS_MACOSX) | 366 #if defined(OS_MACOSX) |
| 365 confirm_quit::RegisterLocalState(registry); | 367 confirm_quit::RegisterLocalState(registry); |
| 366 QuitWithAppsController::RegisterPrefs(registry); | 368 QuitWithAppsController::RegisterPrefs(registry); |
| 367 #endif | 369 #endif |
| 368 | 370 |
| 369 #if defined(OS_WIN) | 371 #if defined(OS_WIN) |
| 370 app_metro_launch::RegisterPrefs(registry); | 372 app_metro_launch::RegisterPrefs(registry); |
| 371 component_updater::RegisterPrefsForSwReporter(registry); | 373 component_updater::RegisterPrefsForSwReporter(registry); |
| (...skipping 335 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 707 host_zoom_dictionary, false /* sanitize_partition_host_zoom_levels */); | 709 host_zoom_dictionary, false /* sanitize_partition_host_zoom_levels */); |
| 708 | 710 |
| 709 // We're done migrating the profile per-host zoom level values, so we clear | 711 // We're done migrating the profile per-host zoom level values, so we clear |
| 710 // them all. | 712 // them all. |
| 711 DictionaryPrefUpdate host_zoom_dictionary_update( | 713 DictionaryPrefUpdate host_zoom_dictionary_update( |
| 712 prefs, prefs::kPerHostZoomLevelsDeprecated); | 714 prefs, prefs::kPerHostZoomLevelsDeprecated); |
| 713 host_zoom_dictionary_update->Clear(); | 715 host_zoom_dictionary_update->Clear(); |
| 714 } | 716 } |
| 715 | 717 |
| 716 } // namespace chrome | 718 } // namespace chrome |
| OLD | NEW |