| 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 10 matching lines...) Expand all Loading... |
| 21 #include "chrome/browser/extensions/extensions_ui.h" | 21 #include "chrome/browser/extensions/extensions_ui.h" |
| 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_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/ssl_config_service_manager.h" |
| 31 #include "chrome/browser/net/predictor_api.h" | 32 #include "chrome/browser/net/predictor_api.h" |
| 32 #include "chrome/browser/net/pref_proxy_config_service.h" | 33 #include "chrome/browser/net/pref_proxy_config_service.h" |
| 33 #include "chrome/browser/net/ssl_config_service_manager.h" | 34 #include "chrome/browser/net/ssl_config_service_manager.h" |
| 34 #include "chrome/browser/notifications/desktop_notification_service.h" | 35 #include "chrome/browser/notifications/desktop_notification_service.h" |
| 35 #include "chrome/browser/notifications/notification_ui_manager.h" | 36 #include "chrome/browser/notifications/notification_ui_manager.h" |
| 36 #include "chrome/browser/page_info_model.h" | 37 #include "chrome/browser/page_info_model.h" |
| 37 #include "chrome/browser/password_manager/password_manager.h" | 38 #include "chrome/browser/password_manager/password_manager.h" |
| 38 #include "chrome/browser/plugin_updater.h" | 39 #include "chrome/browser/plugin_updater.h" |
| 39 #include "chrome/browser/policy/cloud_policy_subsystem.h" | 40 #include "chrome/browser/policy/cloud_policy_subsystem.h" |
| 40 #include "chrome/browser/prefs/session_startup_pref.h" | 41 #include "chrome/browser/prefs/session_startup_pref.h" |
| (...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 202 user_prefs->Set(prefs::kBrowserWindowPlacement, *(pref->GetValue())); | 203 user_prefs->Set(prefs::kBrowserWindowPlacement, *(pref->GetValue())); |
| 203 } | 204 } |
| 204 local_state->ClearPref(prefs::kBrowserWindowPlacement); | 205 local_state->ClearPref(prefs::kBrowserWindowPlacement); |
| 205 | 206 |
| 206 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 207 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
| 207 current_version | WINDOWS_PREFS); | 208 current_version | WINDOWS_PREFS); |
| 208 } | 209 } |
| 209 } | 210 } |
| 210 | 211 |
| 211 } // namespace browser | 212 } // namespace browser |
| OLD | NEW |