| 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 "apps/prefs.h" | 7 #include "apps/prefs.h" |
| 8 #include "base/debug/trace_event.h" | 8 #include "base/debug/trace_event.h" |
| 9 #include "base/prefs/pref_registry_simple.h" | 9 #include "base/prefs/pref_registry_simple.h" |
| 10 #include "base/prefs/pref_service.h" | 10 #include "base/prefs/pref_service.h" |
| (...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 105 #endif | 105 #endif |
| 106 | 106 |
| 107 #if defined(ENABLE_CONFIGURATION_POLICY) | 107 #if defined(ENABLE_CONFIGURATION_POLICY) |
| 108 #include "chrome/browser/policy/browser_policy_connector.h" | 108 #include "chrome/browser/policy/browser_policy_connector.h" |
| 109 #include "components/policy/core/common/policy_statistics_collector.h" | 109 #include "components/policy/core/common/policy_statistics_collector.h" |
| 110 #include "components/policy/core/common/url_blacklist_manager.h" | 110 #include "components/policy/core/common/url_blacklist_manager.h" |
| 111 #endif | 111 #endif |
| 112 | 112 |
| 113 #if defined(ENABLE_MANAGED_USERS) | 113 #if defined(ENABLE_MANAGED_USERS) |
| 114 #include "chrome/browser/managed_mode/managed_user_service.h" | 114 #include "chrome/browser/managed_mode/managed_user_service.h" |
| 115 #include "chrome/browser/managed_mode/managed_user_shared_settings_service.h" |
| 115 #include "chrome/browser/managed_mode/managed_user_sync_service.h" | 116 #include "chrome/browser/managed_mode/managed_user_sync_service.h" |
| 116 #endif | 117 #endif |
| 117 | 118 |
| 118 #if defined(ENABLE_MDNS) | 119 #if defined(ENABLE_MDNS) |
| 119 #include "chrome/browser/ui/webui/local_discovery/local_discovery_ui.h" | 120 #include "chrome/browser/ui/webui/local_discovery/local_discovery_ui.h" |
| 120 #endif | 121 #endif |
| 121 | 122 |
| 122 #if defined(ENABLE_PLUGIN_INSTALLATION) | 123 #if defined(ENABLE_PLUGIN_INSTALLATION) |
| 123 #include "chrome/browser/plugins/plugins_resource_service.h" | 124 #include "chrome/browser/plugins/plugins_resource_service.h" |
| 124 #endif | 125 #endif |
| (...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 380 #endif | 381 #endif |
| 381 | 382 |
| 382 #if defined(ENABLE_FULL_PRINTING) | 383 #if defined(ENABLE_FULL_PRINTING) |
| 383 print_dialog_cloud::RegisterProfilePrefs(registry); | 384 print_dialog_cloud::RegisterProfilePrefs(registry); |
| 384 printing::StickySettings::RegisterProfilePrefs(registry); | 385 printing::StickySettings::RegisterProfilePrefs(registry); |
| 385 CloudPrintURL::RegisterProfilePrefs(registry); | 386 CloudPrintURL::RegisterProfilePrefs(registry); |
| 386 #endif | 387 #endif |
| 387 | 388 |
| 388 #if defined(ENABLE_MANAGED_USERS) | 389 #if defined(ENABLE_MANAGED_USERS) |
| 389 ManagedUserService::RegisterProfilePrefs(registry); | 390 ManagedUserService::RegisterProfilePrefs(registry); |
| 391 ManagedUserSharedSettingsService::RegisterProfilePrefs(registry); |
| 390 ManagedUserSyncService::RegisterProfilePrefs(registry); | 392 ManagedUserSyncService::RegisterProfilePrefs(registry); |
| 391 #endif | 393 #endif |
| 392 | 394 |
| 393 #if defined(ENABLE_MDNS) | 395 #if defined(ENABLE_MDNS) |
| 394 LocalDiscoveryUI::RegisterProfilePrefs(registry); | 396 LocalDiscoveryUI::RegisterProfilePrefs(registry); |
| 395 #endif | 397 #endif |
| 396 | 398 |
| 397 #if defined(ENABLE_NOTIFICATIONS) | 399 #if defined(ENABLE_NOTIFICATIONS) |
| 398 DesktopNotificationService::RegisterProfilePrefs(registry); | 400 DesktopNotificationService::RegisterProfilePrefs(registry); |
| 399 #endif | 401 #endif |
| (...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 564 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 566 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
| 565 current_version); | 567 current_version); |
| 566 } | 568 } |
| 567 | 569 |
| 568 #if defined(OS_CHROMEOS) | 570 #if defined(OS_CHROMEOS) |
| 569 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); | 571 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); |
| 570 #endif | 572 #endif |
| 571 } | 573 } |
| 572 | 574 |
| 573 } // namespace chrome | 575 } // namespace chrome |
| OLD | NEW |