| 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 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 118 #include "chrome/browser/extensions/activity_log/activity_log.h" | 118 #include "chrome/browser/extensions/activity_log/activity_log.h" |
| 119 #include "chrome/browser/extensions/api/commands/command_service.h" | 119 #include "chrome/browser/extensions/api/commands/command_service.h" |
| 120 #include "chrome/browser/extensions/api/tabs/tabs_api.h" | 120 #include "chrome/browser/extensions/api/tabs/tabs_api.h" |
| 121 #include "chrome/browser/extensions/extension_web_ui.h" | 121 #include "chrome/browser/extensions/extension_web_ui.h" |
| 122 #include "chrome/browser/extensions/launch_util.h" | 122 #include "chrome/browser/extensions/launch_util.h" |
| 123 #include "chrome/browser/signin/easy_unlock_service.h" | 123 #include "chrome/browser/signin/easy_unlock_service.h" |
| 124 #include "chrome/browser/ui/webui/extensions/extension_settings_handler.h" | 124 #include "chrome/browser/ui/webui/extensions/extension_settings_handler.h" |
| 125 #include "extensions/browser/extension_prefs.h" | 125 #include "extensions/browser/extension_prefs.h" |
| 126 #if !defined(OS_ANDROID) && !defined(OS_IOS) | 126 #if !defined(OS_ANDROID) && !defined(OS_IOS) |
| 127 #include "chrome/browser/extensions/api/copresence/copresence_api.h" | 127 #include "chrome/browser/extensions/api/copresence/copresence_api.h" |
| 128 #include "chrome/browser/ui/toolbar/toolbar_actions_bar.h" |
| 128 #endif | 129 #endif |
| 129 #endif // defined(ENABLE_EXTENSIONS) | 130 #endif // defined(ENABLE_EXTENSIONS) |
| 130 | 131 |
| 131 #if defined(ENABLE_PLUGIN_INSTALLATION) | 132 #if defined(ENABLE_PLUGIN_INSTALLATION) |
| 132 #include "chrome/browser/plugins/plugins_resource_service.h" | 133 #include "chrome/browser/plugins/plugins_resource_service.h" |
| 133 #endif | 134 #endif |
| 134 | 135 |
| 135 #if defined(ENABLE_SUPERVISED_USERS) | 136 #if defined(ENABLE_SUPERVISED_USERS) |
| 136 #include "chrome/browser/supervised_user/legacy/supervised_user_shared_settings_
service.h" | 137 #include "chrome/browser/supervised_user/legacy/supervised_user_shared_settings_
service.h" |
| 137 #include "chrome/browser/supervised_user/legacy/supervised_user_sync_service.h" | 138 #include "chrome/browser/supervised_user/legacy/supervised_user_sync_service.h" |
| (...skipping 280 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 418 policy::URLBlacklistManager::RegisterProfilePrefs(registry); | 419 policy::URLBlacklistManager::RegisterProfilePrefs(registry); |
| 419 #endif | 420 #endif |
| 420 | 421 |
| 421 #if defined(ENABLE_EXTENSIONS) | 422 #if defined(ENABLE_EXTENSIONS) |
| 422 EasyUnlockService::RegisterProfilePrefs(registry); | 423 EasyUnlockService::RegisterProfilePrefs(registry); |
| 423 extensions::ActivityLog::RegisterProfilePrefs(registry); | 424 extensions::ActivityLog::RegisterProfilePrefs(registry); |
| 424 extensions::launch_util::RegisterProfilePrefs(registry); | 425 extensions::launch_util::RegisterProfilePrefs(registry); |
| 425 ExtensionWebUI::RegisterProfilePrefs(registry); | 426 ExtensionWebUI::RegisterProfilePrefs(registry); |
| 426 extensions::ExtensionPrefs::RegisterProfilePrefs(registry); | 427 extensions::ExtensionPrefs::RegisterProfilePrefs(registry); |
| 427 #if !defined(OS_ANDROID) && !defined(OS_IOS) | 428 #if !defined(OS_ANDROID) && !defined(OS_IOS) |
| 429 ToolbarActionsBar::RegisterProfilePrefs(registry); |
| 428 extensions::CopresenceService::RegisterProfilePrefs(registry); | 430 extensions::CopresenceService::RegisterProfilePrefs(registry); |
| 429 #endif | 431 #endif |
| 430 RegisterAnimationPolicyPrefs(registry); | 432 RegisterAnimationPolicyPrefs(registry); |
| 431 #endif // defined(ENABLE_EXTENSIONS) | 433 #endif // defined(ENABLE_EXTENSIONS) |
| 432 | 434 |
| 433 #if defined(ENABLE_NOTIFICATIONS) | 435 #if defined(ENABLE_NOTIFICATIONS) |
| 434 DesktopNotificationService::RegisterProfilePrefs(registry); | 436 DesktopNotificationService::RegisterProfilePrefs(registry); |
| 435 #endif | 437 #endif |
| 436 | 438 |
| 437 #if defined(ENABLE_NOTIFICATIONS) && defined(ENABLE_EXTENSIONS) && \ | 439 #if defined(ENABLE_NOTIFICATIONS) && defined(ENABLE_EXTENSIONS) && \ |
| (...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 622 host_zoom_dictionary, false /* sanitize_partition_host_zoom_levels */); | 624 host_zoom_dictionary, false /* sanitize_partition_host_zoom_levels */); |
| 623 | 625 |
| 624 // We're done migrating the profile per-host zoom level values, so we clear | 626 // We're done migrating the profile per-host zoom level values, so we clear |
| 625 // them all. | 627 // them all. |
| 626 DictionaryPrefUpdate host_zoom_dictionary_update( | 628 DictionaryPrefUpdate host_zoom_dictionary_update( |
| 627 prefs, prefs::kPerHostZoomLevelsDeprecated); | 629 prefs, prefs::kPerHostZoomLevelsDeprecated); |
| 628 host_zoom_dictionary_update->Clear(); | 630 host_zoom_dictionary_update->Clear(); |
| 629 } | 631 } |
| 630 | 632 |
| 631 } // namespace chrome | 633 } // namespace chrome |
| OLD | NEW |