| 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/metrics/histogram.h" | 9 #include "base/metrics/histogram.h" |
| 10 #include "base/prefs/pref_registry_simple.h" | 10 #include "base/prefs/pref_registry_simple.h" |
| (...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 185 #include "chrome/browser/chromeos/system/automatic_reboot_manager.h" | 185 #include "chrome/browser/chromeos/system/automatic_reboot_manager.h" |
| 186 #include "chrome/browser/extensions/api/enterprise_platform_keys_private/enterpr
ise_platform_keys_private_api.h" | 186 #include "chrome/browser/extensions/api/enterprise_platform_keys_private/enterpr
ise_platform_keys_private_api.h" |
| 187 #include "chrome/browser/extensions/extension_assets_manager_chromeos.h" | 187 #include "chrome/browser/extensions/extension_assets_manager_chromeos.h" |
| 188 #include "chrome/browser/metrics/chromeos_metrics_provider.h" | 188 #include "chrome/browser/metrics/chromeos_metrics_provider.h" |
| 189 #include "chrome/browser/ui/webui/chromeos/login/demo_mode_detector.h" | 189 #include "chrome/browser/ui/webui/chromeos/login/demo_mode_detector.h" |
| 190 #include "chrome/browser/ui/webui/chromeos/login/enable_debugging_screen_handler
.h" | 190 #include "chrome/browser/ui/webui/chromeos/login/enable_debugging_screen_handler
.h" |
| 191 #include "chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.h" | 191 #include "chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.h" |
| 192 #include "chrome/browser/ui/webui/chromeos/login/reset_screen_handler.h" | 192 #include "chrome/browser/ui/webui/chromeos/login/reset_screen_handler.h" |
| 193 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" | 193 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" |
| 194 #include "chromeos/audio/audio_devices_pref_handler_impl.h" | 194 #include "chromeos/audio/audio_devices_pref_handler_impl.h" |
| 195 #include "chromeos/timezone/timezone_resolver.h" |
| 195 #include "components/invalidation/invalidator_storage.h" | 196 #include "components/invalidation/invalidator_storage.h" |
| 196 #else | 197 #else |
| 197 #include "chrome/browser/extensions/default_apps.h" | 198 #include "chrome/browser/extensions/default_apps.h" |
| 198 #endif | 199 #endif |
| 199 | 200 |
| 200 #if defined(OS_MACOSX) | 201 #if defined(OS_MACOSX) |
| 201 #include "chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.h" | 202 #include "chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.h" |
| 202 #include "chrome/browser/ui/cocoa/confirm_quit.h" | 203 #include "chrome/browser/ui/cocoa/confirm_quit.h" |
| 203 #endif | 204 #endif |
| 204 | 205 |
| (...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 345 chromeos::WallpaperManager::RegisterPrefs(registry); | 346 chromeos::WallpaperManager::RegisterPrefs(registry); |
| 346 chromeos::echo_offer::RegisterPrefs(registry); | 347 chromeos::echo_offer::RegisterPrefs(registry); |
| 347 extensions::ExtensionAssetsManagerChromeOS::RegisterPrefs(registry); | 348 extensions::ExtensionAssetsManagerChromeOS::RegisterPrefs(registry); |
| 348 invalidation::InvalidatorStorage::RegisterPrefs(registry); | 349 invalidation::InvalidatorStorage::RegisterPrefs(registry); |
| 349 policy::AutoEnrollmentClient::RegisterPrefs(registry); | 350 policy::AutoEnrollmentClient::RegisterPrefs(registry); |
| 350 policy::BrowserPolicyConnectorChromeOS::RegisterPrefs(registry); | 351 policy::BrowserPolicyConnectorChromeOS::RegisterPrefs(registry); |
| 351 policy::ConsumerManagementService::RegisterPrefs(registry); | 352 policy::ConsumerManagementService::RegisterPrefs(registry); |
| 352 policy::DeviceCloudPolicyManagerChromeOS::RegisterPrefs(registry); | 353 policy::DeviceCloudPolicyManagerChromeOS::RegisterPrefs(registry); |
| 353 policy::DeviceStatusCollector::RegisterPrefs(registry); | 354 policy::DeviceStatusCollector::RegisterPrefs(registry); |
| 354 policy::PolicyCertServiceFactory::RegisterPrefs(registry); | 355 policy::PolicyCertServiceFactory::RegisterPrefs(registry); |
| 356 chromeos::TimeZoneResolver::RegisterPrefs(registry); |
| 355 #endif | 357 #endif |
| 356 | 358 |
| 357 #if defined(OS_MACOSX) | 359 #if defined(OS_MACOSX) |
| 358 confirm_quit::RegisterLocalState(registry); | 360 confirm_quit::RegisterLocalState(registry); |
| 359 QuitWithAppsController::RegisterPrefs(registry); | 361 QuitWithAppsController::RegisterPrefs(registry); |
| 360 #endif | 362 #endif |
| 361 | 363 |
| 362 #if defined(OS_WIN) | 364 #if defined(OS_WIN) |
| 363 app_metro_launch::RegisterPrefs(registry); | 365 app_metro_launch::RegisterPrefs(registry); |
| 364 component_updater::RegisterPrefsForSwReporter(registry); | 366 component_updater::RegisterPrefsForSwReporter(registry); |
| (...skipping 315 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 680 host_zoom_dictionary, false /* sanitize_partition_host_zoom_levels */); | 682 host_zoom_dictionary, false /* sanitize_partition_host_zoom_levels */); |
| 681 | 683 |
| 682 // We're done migrating the profile per-host zoom level values, so we clear | 684 // We're done migrating the profile per-host zoom level values, so we clear |
| 683 // them all. | 685 // them all. |
| 684 DictionaryPrefUpdate host_zoom_dictionary_update( | 686 DictionaryPrefUpdate host_zoom_dictionary_update( |
| 685 prefs, prefs::kPerHostZoomLevelsDeprecated); | 687 prefs, prefs::kPerHostZoomLevelsDeprecated); |
| 686 host_zoom_dictionary_update->Clear(); | 688 host_zoom_dictionary_update->Clear(); |
| 687 } | 689 } |
| 688 | 690 |
| 689 } // namespace chrome | 691 } // namespace chrome |
| OLD | NEW |