| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "chrome/browser/about_flags.h" | 7 #include "chrome/browser/about_flags.h" |
| 8 #include "chrome/browser/autofill/autofill_manager.h" | 8 #include "chrome/browser/autofill/autofill_manager.h" |
| 9 #include "chrome/browser/background/background_contents_service.h" | 9 #include "chrome/browser/background/background_contents_service.h" |
| 10 #include "chrome/browser/background/background_mode_manager.h" | 10 #include "chrome/browser/background/background_mode_manager.h" |
| (...skipping 12 matching lines...) Expand all Loading... |
| 23 #include "chrome/browser/geolocation/geolocation_content_settings_map.h" | 23 #include "chrome/browser/geolocation/geolocation_content_settings_map.h" |
| 24 #include "chrome/browser/geolocation/geolocation_prefs.h" | 24 #include "chrome/browser/geolocation/geolocation_prefs.h" |
| 25 #include "chrome/browser/google/google_url_tracker.h" | 25 #include "chrome/browser/google/google_url_tracker.h" |
| 26 #include "chrome/browser/instant/instant_controller.h" | 26 #include "chrome/browser/instant/instant_controller.h" |
| 27 #include "chrome/browser/intranet_redirect_detector.h" | 27 #include "chrome/browser/intranet_redirect_detector.h" |
| 28 #include "chrome/browser/metrics/metrics_log.h" | 28 #include "chrome/browser/metrics/metrics_log.h" |
| 29 #include "chrome/browser/metrics/metrics_service.h" | 29 #include "chrome/browser/metrics/metrics_service.h" |
| 30 #include "chrome/browser/net/net_pref_observer.h" | 30 #include "chrome/browser/net/net_pref_observer.h" |
| 31 #include "chrome/browser/net/predictor_api.h" | 31 #include "chrome/browser/net/predictor_api.h" |
| 32 #include "chrome/browser/net/pref_proxy_config_service.h" | 32 #include "chrome/browser/net/pref_proxy_config_service.h" |
| 33 #include "chrome/browser/net/ssl_config_service_manager.h" |
| 33 #include "chrome/browser/notifications/desktop_notification_service.h" | 34 #include "chrome/browser/notifications/desktop_notification_service.h" |
| 34 #include "chrome/browser/notifications/notification_ui_manager.h" | 35 #include "chrome/browser/notifications/notification_ui_manager.h" |
| 35 #include "chrome/browser/page_info_model.h" | 36 #include "chrome/browser/page_info_model.h" |
| 36 #include "chrome/browser/password_manager/password_manager.h" | 37 #include "chrome/browser/password_manager/password_manager.h" |
| 37 #include "chrome/browser/plugin_updater.h" | 38 #include "chrome/browser/plugin_updater.h" |
| 38 #include "chrome/browser/policy/cloud_policy_subsystem.h" | 39 #include "chrome/browser/policy/cloud_policy_subsystem.h" |
| 39 #include "chrome/browser/prefs/session_startup_pref.h" | 40 #include "chrome/browser/prefs/session_startup_pref.h" |
| 40 #include "chrome/browser/printing/print_job_manager.h" | 41 #include "chrome/browser/printing/print_job_manager.h" |
| 41 #include "chrome/browser/profiles/profile_impl.h" | 42 #include "chrome/browser/profiles/profile_impl.h" |
| 42 #include "chrome/browser/profiles/profile_info_cache.h" | 43 #include "chrome/browser/profiles/profile_info_cache.h" |
| (...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 106 #if defined(TOOLKIT_VIEWS) | 107 #if defined(TOOLKIT_VIEWS) |
| 107 BrowserView::RegisterBrowserViewPrefs(local_state); | 108 BrowserView::RegisterBrowserViewPrefs(local_state); |
| 108 #endif | 109 #endif |
| 109 UpgradeDetector::RegisterPrefs(local_state); | 110 UpgradeDetector::RegisterPrefs(local_state); |
| 110 TaskManager::RegisterPrefs(local_state); | 111 TaskManager::RegisterPrefs(local_state); |
| 111 geolocation::RegisterPrefs(local_state); | 112 geolocation::RegisterPrefs(local_state); |
| 112 AutofillManager::RegisterBrowserPrefs(local_state); | 113 AutofillManager::RegisterBrowserPrefs(local_state); |
| 113 BackgroundModeManager::RegisterPrefs(local_state); | 114 BackgroundModeManager::RegisterPrefs(local_state); |
| 114 NotificationUIManager::RegisterPrefs(local_state); | 115 NotificationUIManager::RegisterPrefs(local_state); |
| 115 PrefProxyConfigService::RegisterPrefs(local_state); | 116 PrefProxyConfigService::RegisterPrefs(local_state); |
| 117 SSLConfigServiceManager::RegisterPrefs(local_state); |
| 116 #if defined(ENABLE_CONFIGURATION_POLICY) | 118 #if defined(ENABLE_CONFIGURATION_POLICY) |
| 117 policy::CloudPolicySubsystem::RegisterPrefs(local_state); | 119 policy::CloudPolicySubsystem::RegisterPrefs(local_state); |
| 118 #endif | 120 #endif |
| 119 ProfileInfoCache::RegisterPrefs(local_state); | 121 ProfileInfoCache::RegisterPrefs(local_state); |
| 120 ProfileManager::RegisterPrefs(local_state); | 122 ProfileManager::RegisterPrefs(local_state); |
| 121 #if defined(OS_CHROMEOS) | 123 #if defined(OS_CHROMEOS) |
| 122 chromeos::AudioMixerAlsa::RegisterPrefs(local_state); | 124 chromeos::AudioMixerAlsa::RegisterPrefs(local_state); |
| 123 chromeos::UserManager::RegisterPrefs(local_state); | 125 chromeos::UserManager::RegisterPrefs(local_state); |
| 124 chromeos::UserCrosSettingsProvider::RegisterPrefs(local_state); | 126 chromeos::UserCrosSettingsProvider::RegisterPrefs(local_state); |
| 125 chromeos::WizardController::RegisterPrefs(local_state); | 127 chromeos::WizardController::RegisterPrefs(local_state); |
| (...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 200 user_prefs->Set(prefs::kBrowserWindowPlacement, *(pref->GetValue())); | 202 user_prefs->Set(prefs::kBrowserWindowPlacement, *(pref->GetValue())); |
| 201 } | 203 } |
| 202 local_state->ClearPref(prefs::kBrowserWindowPlacement); | 204 local_state->ClearPref(prefs::kBrowserWindowPlacement); |
| 203 | 205 |
| 204 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 206 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
| 205 current_version | WINDOWS_PREFS); | 207 current_version | WINDOWS_PREFS); |
| 206 } | 208 } |
| 207 } | 209 } |
| 208 | 210 |
| 209 } // namespace browser | 211 } // namespace browser |
| OLD | NEW |