| 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 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 43 #include "chrome/browser/metrics/metrics_log.h" | 43 #include "chrome/browser/metrics/metrics_log.h" |
| 44 #include "chrome/browser/metrics/metrics_service.h" | 44 #include "chrome/browser/metrics/metrics_service.h" |
| 45 #include "chrome/browser/metrics/variations/variations_service.h" | 45 #include "chrome/browser/metrics/variations/variations_service.h" |
| 46 #include "chrome/browser/net/http_server_properties_manager.h" | 46 #include "chrome/browser/net/http_server_properties_manager.h" |
| 47 #include "chrome/browser/net/net_pref_observer.h" | 47 #include "chrome/browser/net/net_pref_observer.h" |
| 48 #include "chrome/browser/net/predictor.h" | 48 #include "chrome/browser/net/predictor.h" |
| 49 #include "chrome/browser/net/pref_proxy_config_tracker_impl.h" | 49 #include "chrome/browser/net/pref_proxy_config_tracker_impl.h" |
| 50 #include "chrome/browser/net/ssl_config_service_manager.h" | 50 #include "chrome/browser/net/ssl_config_service_manager.h" |
| 51 #include "chrome/browser/network_time/network_time_service.h" | 51 #include "chrome/browser/network_time/network_time_service.h" |
| 52 #include "chrome/browser/notifications/desktop_notification_service.h" | 52 #include "chrome/browser/notifications/desktop_notification_service.h" |
| 53 #include "chrome/browser/notifications/notification_prefs_manager.h" | 53 #include "chrome/browser/notifications/message_center_notification_manager.h" |
| 54 #include "chrome/browser/pepper_flash_settings_manager.h" | 54 #include "chrome/browser/pepper_flash_settings_manager.h" |
| 55 #include "chrome/browser/plugins/plugin_finder.h" | 55 #include "chrome/browser/plugins/plugin_finder.h" |
| 56 #include "chrome/browser/prefs/chrome_pref_service_factory.h" | 56 #include "chrome/browser/prefs/chrome_pref_service_factory.h" |
| 57 #include "chrome/browser/prefs/incognito_mode_prefs.h" | 57 #include "chrome/browser/prefs/incognito_mode_prefs.h" |
| 58 #include "chrome/browser/prefs/pref_service_syncable.h" | 58 #include "chrome/browser/prefs/pref_service_syncable.h" |
| 59 #include "chrome/browser/prefs/session_startup_pref.h" | 59 #include "chrome/browser/prefs/session_startup_pref.h" |
| 60 #include "chrome/browser/printing/cloud_print/cloud_print_url.h" | 60 #include "chrome/browser/printing/cloud_print/cloud_print_url.h" |
| 61 #include "chrome/browser/printing/print_dialog_cloud.h" | 61 #include "chrome/browser/printing/print_dialog_cloud.h" |
| 62 #include "chrome/browser/profiles/chrome_version_service.h" | 62 #include "chrome/browser/profiles/chrome_version_service.h" |
| 63 #include "chrome/browser/profiles/profile.h" | 63 #include "chrome/browser/profiles/profile.h" |
| (...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 254 #if defined(ENABLE_AUTOFILL_DIALOG) | 254 #if defined(ENABLE_AUTOFILL_DIALOG) |
| 255 autofill::AutofillDialogController::RegisterPrefs(registry); | 255 autofill::AutofillDialogController::RegisterPrefs(registry); |
| 256 #endif | 256 #endif |
| 257 | 257 |
| 258 #if defined(ENABLE_CONFIGURATION_POLICY) | 258 #if defined(ENABLE_CONFIGURATION_POLICY) |
| 259 policy::BrowserPolicyConnector::RegisterPrefs(registry); | 259 policy::BrowserPolicyConnector::RegisterPrefs(registry); |
| 260 policy::PolicyStatisticsCollector::RegisterPrefs(registry); | 260 policy::PolicyStatisticsCollector::RegisterPrefs(registry); |
| 261 #endif | 261 #endif |
| 262 | 262 |
| 263 #if defined(ENABLE_NOTIFICATIONS) | 263 #if defined(ENABLE_NOTIFICATIONS) |
| 264 NotificationPrefsManager::RegisterPrefs(registry); | 264 MessageCenterNotificationManager::RegisterPrefs(registry); |
| 265 #endif | 265 #endif |
| 266 | 266 |
| 267 #if defined(ENABLE_PLUGINS) | 267 #if defined(ENABLE_PLUGINS) |
| 268 PluginFinder::RegisterPrefs(registry); | 268 PluginFinder::RegisterPrefs(registry); |
| 269 #endif | 269 #endif |
| 270 | 270 |
| 271 #if defined(ENABLE_PLUGIN_INSTALLATION) | 271 #if defined(ENABLE_PLUGIN_INSTALLATION) |
| 272 PluginsResourceService::RegisterPrefs(registry); | 272 PluginsResourceService::RegisterPrefs(registry); |
| 273 #endif | 273 #endif |
| 274 | 274 |
| (...skipping 302 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 577 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 577 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
| 578 current_version); | 578 current_version); |
| 579 } | 579 } |
| 580 | 580 |
| 581 #if defined(OS_CHROMEOS) | 581 #if defined(OS_CHROMEOS) |
| 582 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); | 582 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); |
| 583 #endif | 583 #endif |
| 584 } | 584 } |
| 585 | 585 |
| 586 } // namespace chrome | 586 } // namespace chrome |
| OLD | NEW |