| 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 11 matching lines...) Expand all Loading... |
| 22 #include "chrome/browser/external_protocol/external_protocol_handler.h" | 22 #include "chrome/browser/external_protocol/external_protocol_handler.h" |
| 23 #include "chrome/browser/geolocation/geolocation_prefs.h" | 23 #include "chrome/browser/geolocation/geolocation_prefs.h" |
| 24 #include "chrome/browser/google/google_url_tracker.h" | 24 #include "chrome/browser/google/google_url_tracker.h" |
| 25 #include "chrome/browser/instant/instant_controller.h" | 25 #include "chrome/browser/instant/instant_controller.h" |
| 26 #include "chrome/browser/intranet_redirect_detector.h" | 26 #include "chrome/browser/intranet_redirect_detector.h" |
| 27 #include "chrome/browser/metrics/metrics_log.h" | 27 #include "chrome/browser/metrics/metrics_log.h" |
| 28 #include "chrome/browser/metrics/metrics_service.h" | 28 #include "chrome/browser/metrics/metrics_service.h" |
| 29 #include "chrome/browser/net/net_pref_observer.h" | 29 #include "chrome/browser/net/net_pref_observer.h" |
| 30 #include "chrome/browser/net/predictor_api.h" | 30 #include "chrome/browser/net/predictor_api.h" |
| 31 #include "chrome/browser/net/pref_proxy_config_service.h" | 31 #include "chrome/browser/net/pref_proxy_config_service.h" |
| 32 #include "chrome/browser/net/spdy_config_service_manager.h" |
| 32 #include "chrome/browser/net/ssl_config_service_manager.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_prefs.h" | 38 #include "chrome/browser/plugin_prefs.h" |
| 38 #include "chrome/browser/policy/cloud_policy_subsystem.h" | 39 #include "chrome/browser/policy/cloud_policy_subsystem.h" |
| 39 #include "chrome/browser/prefs/incognito_mode_prefs.h" | 40 #include "chrome/browser/prefs/incognito_mode_prefs.h" |
| 40 #include "chrome/browser/prefs/session_startup_pref.h" | 41 #include "chrome/browser/prefs/session_startup_pref.h" |
| 41 #include "chrome/browser/printing/print_job_manager.h" | 42 #include "chrome/browser/printing/print_job_manager.h" |
| (...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 171 BrowserWindowGtk::RegisterUserPrefs(user_prefs); | 172 BrowserWindowGtk::RegisterUserPrefs(user_prefs); |
| 172 #endif | 173 #endif |
| 173 #if defined(OS_CHROMEOS) | 174 #if defined(OS_CHROMEOS) |
| 174 chromeos::Preferences::RegisterUserPrefs(user_prefs); | 175 chromeos::Preferences::RegisterUserPrefs(user_prefs); |
| 175 #endif | 176 #endif |
| 176 BackgroundContentsService::RegisterUserPrefs(user_prefs); | 177 BackgroundContentsService::RegisterUserPrefs(user_prefs); |
| 177 SigninManager::RegisterUserPrefs(user_prefs); | 178 SigninManager::RegisterUserPrefs(user_prefs); |
| 178 TemplateURLService::RegisterUserPrefs(user_prefs); | 179 TemplateURLService::RegisterUserPrefs(user_prefs); |
| 179 InstantController::RegisterUserPrefs(user_prefs); | 180 InstantController::RegisterUserPrefs(user_prefs); |
| 180 NetPrefObserver::RegisterPrefs(user_prefs); | 181 NetPrefObserver::RegisterPrefs(user_prefs); |
| 182 SpdyConfigServiceManager::RegisterPrefs(user_prefs); |
| 181 ProtocolHandlerRegistry::RegisterPrefs(user_prefs); | 183 ProtocolHandlerRegistry::RegisterPrefs(user_prefs); |
| 182 FirewallTraversalObserver::RegisterUserPrefs(user_prefs); | 184 FirewallTraversalObserver::RegisterUserPrefs(user_prefs); |
| 183 #if defined(OS_MACOSX) | 185 #if defined(OS_MACOSX) |
| 184 PresentationModePrefs::RegisterUserPrefs(user_prefs); | 186 PresentationModePrefs::RegisterUserPrefs(user_prefs); |
| 185 #endif | 187 #endif |
| 186 } | 188 } |
| 187 | 189 |
| 188 void MigrateBrowserPrefs(PrefService* user_prefs, PrefService* local_state) { | 190 void MigrateBrowserPrefs(PrefService* user_prefs, PrefService* local_state) { |
| 189 // Copy pref values which have been migrated to user_prefs from local_state, | 191 // Copy pref values which have been migrated to user_prefs from local_state, |
| 190 // or remove them from local_state outright, if copying is not required. | 192 // or remove them from local_state outright, if copying is not required. |
| (...skipping 18 matching lines...) Expand all Loading... |
| 209 user_prefs->Set(prefs::kBrowserWindowPlacement, *(pref->GetValue())); | 211 user_prefs->Set(prefs::kBrowserWindowPlacement, *(pref->GetValue())); |
| 210 } | 212 } |
| 211 local_state->ClearPref(prefs::kBrowserWindowPlacement); | 213 local_state->ClearPref(prefs::kBrowserWindowPlacement); |
| 212 | 214 |
| 213 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 215 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
| 214 current_version | WINDOWS_PREFS); | 216 current_version | WINDOWS_PREFS); |
| 215 } | 217 } |
| 216 } | 218 } |
| 217 | 219 |
| 218 } // namespace browser | 220 } // namespace browser |
| OLD | NEW |