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 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
104 #include "chrome/browser/background/background_mode_manager.h" | 104 #include "chrome/browser/background/background_mode_manager.h" |
105 #endif | 105 #endif |
106 | 106 |
107 #if defined(ENABLE_CONFIGURATION_POLICY) | 107 #if defined(ENABLE_CONFIGURATION_POLICY) |
108 #include "components/policy/core/browser/browser_policy_connector.h" | 108 #include "components/policy/core/browser/browser_policy_connector.h" |
109 #include "components/policy/core/browser/url_blacklist_manager.h" | 109 #include "components/policy/core/browser/url_blacklist_manager.h" |
110 #include "components/policy/core/common/policy_statistics_collector.h" | 110 #include "components/policy/core/common/policy_statistics_collector.h" |
111 #endif | 111 #endif |
112 | 112 |
113 #if defined(ENABLE_EXTENSIONS) | 113 #if defined(ENABLE_EXTENSIONS) |
| 114 #include "chrome/browser/accessibility/animation_policy_prefs.h" |
114 #include "chrome/browser/apps/drive/drive_app_mapping.h" | 115 #include "chrome/browser/apps/drive/drive_app_mapping.h" |
115 #include "chrome/browser/apps/shortcut_manager.h" | 116 #include "chrome/browser/apps/shortcut_manager.h" |
116 #include "chrome/browser/extensions/activity_log/activity_log.h" | 117 #include "chrome/browser/extensions/activity_log/activity_log.h" |
117 #include "chrome/browser/extensions/api/commands/command_service.h" | 118 #include "chrome/browser/extensions/api/commands/command_service.h" |
118 #include "chrome/browser/extensions/api/tabs/tabs_api.h" | 119 #include "chrome/browser/extensions/api/tabs/tabs_api.h" |
119 #include "chrome/browser/extensions/extension_web_ui.h" | 120 #include "chrome/browser/extensions/extension_web_ui.h" |
120 #include "chrome/browser/extensions/launch_util.h" | 121 #include "chrome/browser/extensions/launch_util.h" |
121 #include "chrome/browser/signin/easy_unlock_service.h" | 122 #include "chrome/browser/signin/easy_unlock_service.h" |
122 #include "chrome/browser/ui/webui/extensions/extension_settings_handler.h" | 123 #include "chrome/browser/ui/webui/extensions/extension_settings_handler.h" |
123 #include "extensions/browser/extension_prefs.h" | 124 #include "extensions/browser/extension_prefs.h" |
(...skipping 309 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
433 | 434 |
434 #if defined(ENABLE_EXTENSIONS) | 435 #if defined(ENABLE_EXTENSIONS) |
435 EasyUnlockService::RegisterProfilePrefs(registry); | 436 EasyUnlockService::RegisterProfilePrefs(registry); |
436 extensions::ActivityLog::RegisterProfilePrefs(registry); | 437 extensions::ActivityLog::RegisterProfilePrefs(registry); |
437 extensions::launch_util::RegisterProfilePrefs(registry); | 438 extensions::launch_util::RegisterProfilePrefs(registry); |
438 ExtensionWebUI::RegisterProfilePrefs(registry); | 439 ExtensionWebUI::RegisterProfilePrefs(registry); |
439 extensions::ExtensionPrefs::RegisterProfilePrefs(registry); | 440 extensions::ExtensionPrefs::RegisterProfilePrefs(registry); |
440 #if !defined(OS_ANDROID) && !defined(OS_IOS) | 441 #if !defined(OS_ANDROID) && !defined(OS_IOS) |
441 extensions::CopresenceService::RegisterProfilePrefs(registry); | 442 extensions::CopresenceService::RegisterProfilePrefs(registry); |
442 #endif | 443 #endif |
| 444 RegisterAnimationPolicyPrefs(registry); |
443 #endif // defined(ENABLE_EXTENSIONS) | 445 #endif // defined(ENABLE_EXTENSIONS) |
444 | 446 |
445 #if defined(ENABLE_NOTIFICATIONS) | 447 #if defined(ENABLE_NOTIFICATIONS) |
446 DesktopNotificationService::RegisterProfilePrefs(registry); | 448 DesktopNotificationService::RegisterProfilePrefs(registry); |
447 #endif | 449 #endif |
448 | 450 |
449 #if defined(ENABLE_NOTIFICATIONS) && defined(ENABLE_EXTENSIONS) && \ | 451 #if defined(ENABLE_NOTIFICATIONS) && defined(ENABLE_EXTENSIONS) && \ |
450 !defined(OS_ANDROID) | 452 !defined(OS_ANDROID) |
451 // The extension welcome notification requires a build that enables extensions | 453 // The extension welcome notification requires a build that enables extensions |
452 // and notifications, and uses the UI message center. | 454 // and notifications, and uses the UI message center. |
(...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
682 host_zoom_dictionary, false /* sanitize_partition_host_zoom_levels */); | 684 host_zoom_dictionary, false /* sanitize_partition_host_zoom_levels */); |
683 | 685 |
684 // We're done migrating the profile per-host zoom level values, so we clear | 686 // We're done migrating the profile per-host zoom level values, so we clear |
685 // them all. | 687 // them all. |
686 DictionaryPrefUpdate host_zoom_dictionary_update( | 688 DictionaryPrefUpdate host_zoom_dictionary_update( |
687 prefs, prefs::kPerHostZoomLevelsDeprecated); | 689 prefs, prefs::kPerHostZoomLevelsDeprecated); |
688 host_zoom_dictionary_update->Clear(); | 690 host_zoom_dictionary_update->Clear(); |
689 } | 691 } |
690 | 692 |
691 } // namespace chrome | 693 } // namespace chrome |
OLD | NEW |