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/prefs/pref_registry_simple.h" | 10 #include "base/prefs/pref_registry_simple.h" |
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
105 #if defined(ENABLE_CONFIGURATION_POLICY) | 105 #if defined(ENABLE_CONFIGURATION_POLICY) |
106 #include "components/policy/core/browser/browser_policy_connector.h" | 106 #include "components/policy/core/browser/browser_policy_connector.h" |
107 #include "components/policy/core/browser/url_blacklist_manager.h" | 107 #include "components/policy/core/browser/url_blacklist_manager.h" |
108 #include "components/policy/core/common/policy_statistics_collector.h" | 108 #include "components/policy/core/common/policy_statistics_collector.h" |
109 #endif | 109 #endif |
110 | 110 |
111 #if defined(ENABLE_EXTENSIONS) | 111 #if defined(ENABLE_EXTENSIONS) |
112 #include "apps/prefs.h" | 112 #include "apps/prefs.h" |
113 #include "chrome/browser/extensions/activity_log/activity_log.h" | 113 #include "chrome/browser/extensions/activity_log/activity_log.h" |
114 #include "chrome/browser/extensions/api/commands/command_service.h" | 114 #include "chrome/browser/extensions/api/commands/command_service.h" |
| 115 #include "chrome/browser/extensions/api/copresence/copresence_api.h" |
115 #include "chrome/browser/extensions/api/tabs/tabs_api.h" | 116 #include "chrome/browser/extensions/api/tabs/tabs_api.h" |
116 #include "chrome/browser/extensions/launch_util.h" | 117 #include "chrome/browser/extensions/launch_util.h" |
117 #include "chrome/browser/signin/easy_unlock_service.h" | 118 #include "chrome/browser/signin/easy_unlock_service.h" |
118 #endif | 119 #endif |
119 | 120 |
120 #if defined(ENABLE_MANAGED_USERS) | 121 #if defined(ENABLE_MANAGED_USERS) |
121 #include "chrome/browser/supervised_user/supervised_user_service.h" | 122 #include "chrome/browser/supervised_user/supervised_user_service.h" |
122 #include "chrome/browser/supervised_user/supervised_user_shared_settings_service
.h" | 123 #include "chrome/browser/supervised_user/supervised_user_shared_settings_service
.h" |
123 #include "chrome/browser/supervised_user/supervised_user_sync_service.h" | 124 #include "chrome/browser/supervised_user/supervised_user_sync_service.h" |
124 #endif | 125 #endif |
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
266 | 267 |
267 #if defined(ENABLE_AUTOFILL_DIALOG) | 268 #if defined(ENABLE_AUTOFILL_DIALOG) |
268 autofill::AutofillDialogController::RegisterPrefs(registry); | 269 autofill::AutofillDialogController::RegisterPrefs(registry); |
269 #endif | 270 #endif |
270 | 271 |
271 #if defined(ENABLE_CONFIGURATION_POLICY) | 272 #if defined(ENABLE_CONFIGURATION_POLICY) |
272 policy::BrowserPolicyConnector::RegisterPrefs(registry); | 273 policy::BrowserPolicyConnector::RegisterPrefs(registry); |
273 policy::PolicyStatisticsCollector::RegisterPrefs(registry); | 274 policy::PolicyStatisticsCollector::RegisterPrefs(registry); |
274 #endif | 275 #endif |
275 | 276 |
| 277 #if defined(ENABLE_EXTENSIONS) |
| 278 extensions::CopresenceService::RegisterPrefs(registry); |
| 279 #endif |
| 280 |
276 #if defined(ENABLE_NOTIFICATIONS) && !defined(OS_ANDROID) | 281 #if defined(ENABLE_NOTIFICATIONS) && !defined(OS_ANDROID) |
277 // Android does not use the message center for notifications. | 282 // Android does not use the message center for notifications. |
278 MessageCenterNotificationManager::RegisterPrefs(registry); | 283 MessageCenterNotificationManager::RegisterPrefs(registry); |
279 #endif | 284 #endif |
280 | 285 |
281 #if defined(ENABLE_PLUGINS) | 286 #if defined(ENABLE_PLUGINS) |
282 PluginFinder::RegisterPrefs(registry); | 287 PluginFinder::RegisterPrefs(registry); |
283 #endif | 288 #endif |
284 | 289 |
285 #if defined(ENABLE_PLUGIN_INSTALLATION) | 290 #if defined(ENABLE_PLUGIN_INSTALLATION) |
(...skipping 321 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
607 #if defined(OS_CHROMEOS) | 612 #if defined(OS_CHROMEOS) |
608 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); | 613 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); |
609 #endif | 614 #endif |
610 | 615 |
611 #if defined(TOOLKIT_VIEWS) | 616 #if defined(TOOLKIT_VIEWS) |
612 MigrateBrowserTabStripPrefs(local_state); | 617 MigrateBrowserTabStripPrefs(local_state); |
613 #endif | 618 #endif |
614 } | 619 } |
615 | 620 |
616 } // namespace chrome | 621 } // namespace chrome |
OLD | NEW |