| 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_macros.h" | 9 #include "base/metrics/histogram_macros.h" |
| 10 #include "base/prefs/pref_registry_simple.h" | 10 #include "base/prefs/pref_registry_simple.h" |
| (...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 166 #include "chrome/browser/chromeos/first_run/first_run.h" | 166 #include "chrome/browser/chromeos/first_run/first_run.h" |
| 167 #include "chrome/browser/chromeos/login/saml/saml_offline_signin_limiter.h" | 167 #include "chrome/browser/chromeos/login/saml/saml_offline_signin_limiter.h" |
| 168 #include "chrome/browser/chromeos/login/session/user_session_manager.h" | 168 #include "chrome/browser/chromeos/login/session/user_session_manager.h" |
| 169 #include "chrome/browser/chromeos/login/startup_utils.h" | 169 #include "chrome/browser/chromeos/login/startup_utils.h" |
| 170 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager.h" | 170 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager.h" |
| 171 #include "chrome/browser/chromeos/login/users/avatar/user_image_sync_observer.h" | 171 #include "chrome/browser/chromeos/login/users/avatar/user_image_sync_observer.h" |
| 172 #include "chrome/browser/chromeos/login/users/chrome_user_manager_impl.h" | 172 #include "chrome/browser/chromeos/login/users/chrome_user_manager_impl.h" |
| 173 #include "chrome/browser/chromeos/login/users/multi_profile_user_controller.h" | 173 #include "chrome/browser/chromeos/login/users/multi_profile_user_controller.h" |
| 174 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h" | 174 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h" |
| 175 #include "chrome/browser/chromeos/net/proxy_config_handler.h" | 175 #include "chrome/browser/chromeos/net/proxy_config_handler.h" |
| 176 #include "chrome/browser/chromeos/platform_keys/key_permissions.h" |
| 176 #include "chrome/browser/chromeos/policy/auto_enrollment_client.h" | 177 #include "chrome/browser/chromeos/policy/auto_enrollment_client.h" |
| 177 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" | 178 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" |
| 178 #include "chrome/browser/chromeos/policy/consumer_management_service.h" | 179 #include "chrome/browser/chromeos/policy/consumer_management_service.h" |
| 179 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h" | 180 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h" |
| 180 #include "chrome/browser/chromeos/policy/device_status_collector.h" | 181 #include "chrome/browser/chromeos/policy/device_status_collector.h" |
| 181 #include "chrome/browser/chromeos/policy/policy_cert_service_factory.h" | 182 #include "chrome/browser/chromeos/policy/policy_cert_service_factory.h" |
| 182 #include "chrome/browser/chromeos/power/power_prefs.h" | 183 #include "chrome/browser/chromeos/power/power_prefs.h" |
| 183 #include "chrome/browser/chromeos/preferences.h" | 184 #include "chrome/browser/chromeos/preferences.h" |
| 184 #include "chrome/browser/chromeos/settings/device_oauth2_token_service.h" | 185 #include "chrome/browser/chromeos/settings/device_oauth2_token_service.h" |
| 185 #include "chrome/browser/chromeos/settings/device_settings_cache.h" | 186 #include "chrome/browser/chromeos/settings/device_settings_cache.h" |
| (...skipping 297 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 483 signin::RegisterProfilePrefs(registry); | 484 signin::RegisterProfilePrefs(registry); |
| 484 #endif | 485 #endif |
| 485 | 486 |
| 486 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) | 487 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) |
| 487 default_apps::RegisterProfilePrefs(registry); | 488 default_apps::RegisterProfilePrefs(registry); |
| 488 #endif | 489 #endif |
| 489 | 490 |
| 490 #if defined(OS_CHROMEOS) | 491 #if defined(OS_CHROMEOS) |
| 491 chromeos::first_run::RegisterProfilePrefs(registry); | 492 chromeos::first_run::RegisterProfilePrefs(registry); |
| 492 chromeos::file_system_provider::RegisterProfilePrefs(registry); | 493 chromeos::file_system_provider::RegisterProfilePrefs(registry); |
| 494 chromeos::KeyPermissions::RegisterProfilePrefs(registry); |
| 493 chromeos::MultiProfileUserController::RegisterProfilePrefs(registry); | 495 chromeos::MultiProfileUserController::RegisterProfilePrefs(registry); |
| 494 chromeos::Preferences::RegisterProfilePrefs(registry); | 496 chromeos::Preferences::RegisterProfilePrefs(registry); |
| 495 chromeos::proxy_config::RegisterProfilePrefs(registry); | 497 chromeos::proxy_config::RegisterProfilePrefs(registry); |
| 496 chromeos::SAMLOfflineSigninLimiter::RegisterProfilePrefs(registry); | 498 chromeos::SAMLOfflineSigninLimiter::RegisterProfilePrefs(registry); |
| 497 chromeos::ServicesCustomizationDocument::RegisterProfilePrefs(registry); | 499 chromeos::ServicesCustomizationDocument::RegisterProfilePrefs(registry); |
| 498 chromeos::UserImageSyncObserver::RegisterProfilePrefs(registry); | 500 chromeos::UserImageSyncObserver::RegisterProfilePrefs(registry); |
| 499 extensions::EnterprisePlatformKeysPrivateChallengeUserKeyFunction:: | 501 extensions::EnterprisePlatformKeysPrivateChallengeUserKeyFunction:: |
| 500 RegisterProfilePrefs(registry); | 502 RegisterProfilePrefs(registry); |
| 501 FlagsUI::RegisterProfilePrefs(registry); | 503 FlagsUI::RegisterProfilePrefs(registry); |
| 502 #endif | 504 #endif |
| (...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 628 host_zoom_dictionary, false /* sanitize_partition_host_zoom_levels */); | 630 host_zoom_dictionary, false /* sanitize_partition_host_zoom_levels */); |
| 629 | 631 |
| 630 // We're done migrating the profile per-host zoom level values, so we clear | 632 // We're done migrating the profile per-host zoom level values, so we clear |
| 631 // them all. | 633 // them all. |
| 632 DictionaryPrefUpdate host_zoom_dictionary_update( | 634 DictionaryPrefUpdate host_zoom_dictionary_update( |
| 633 prefs, prefs::kPerHostZoomLevelsDeprecated); | 635 prefs, prefs::kPerHostZoomLevelsDeprecated); |
| 634 host_zoom_dictionary_update->Clear(); | 636 host_zoom_dictionary_update->Clear(); |
| 635 } | 637 } |
| 636 | 638 |
| 637 } // namespace chrome | 639 } // namespace chrome |
| OLD | NEW |