| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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 "chrome/browser/about_flags.h" | 7 #include "chrome/browser/about_flags.h" |
| 8 #include "chrome/browser/accessibility/invert_bubble_prefs.h" | 8 #include "chrome/browser/accessibility/invert_bubble_prefs.h" |
| 9 #include "chrome/browser/autofill/autofill_manager.h" | 9 #include "chrome/browser/autofill/autofill_manager.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/extension_prefs.h" | 21 #include "chrome/browser/extensions/extension_prefs.h" |
| 22 #include "chrome/browser/extensions/extension_web_ui.h" | 22 #include "chrome/browser/extensions/extension_web_ui.h" |
| 23 #include "chrome/browser/external_protocol/external_protocol_handler.h" | 23 #include "chrome/browser/external_protocol/external_protocol_handler.h" |
| 24 #include "chrome/browser/first_run/first_run.h" | 24 #include "chrome/browser/first_run/first_run.h" |
| 25 #include "chrome/browser/geolocation/geolocation_prefs.h" | 25 #include "chrome/browser/geolocation/geolocation_prefs.h" |
| 26 #include "chrome/browser/google/google_url_tracker.h" | 26 #include "chrome/browser/google/google_url_tracker.h" |
| 27 #include "chrome/browser/google/google_url_tracker_factory.h" | 27 #include "chrome/browser/google/google_url_tracker_factory.h" |
| 28 #include "chrome/browser/instant/instant_controller.h" | 28 #include "chrome/browser/instant/instant_controller.h" |
| 29 #include "chrome/browser/intents/web_intents_util.h" | 29 #include "chrome/browser/intents/web_intents_util.h" |
| 30 #include "chrome/browser/intranet_redirect_detector.h" | 30 #include "chrome/browser/intranet_redirect_detector.h" |
| 31 #include "chrome/browser/managed_mode.h" | 31 #include "chrome/browser/managed_mode/managed_mode.h" |
| 32 #include "chrome/browser/metrics/metrics_log.h" | 32 #include "chrome/browser/metrics/metrics_log.h" |
| 33 #include "chrome/browser/metrics/metrics_service.h" | 33 #include "chrome/browser/metrics/metrics_service.h" |
| 34 #include "chrome/browser/metrics/variations/variations_service.h" | 34 #include "chrome/browser/metrics/variations/variations_service.h" |
| 35 #include "chrome/browser/net/http_server_properties_manager.h" | 35 #include "chrome/browser/net/http_server_properties_manager.h" |
| 36 #include "chrome/browser/net/net_pref_observer.h" | 36 #include "chrome/browser/net/net_pref_observer.h" |
| 37 #include "chrome/browser/net/predictor.h" | 37 #include "chrome/browser/net/predictor.h" |
| 38 #include "chrome/browser/net/ssl_config_service_manager.h" | 38 #include "chrome/browser/net/ssl_config_service_manager.h" |
| 39 #include "chrome/browser/notifications/desktop_notification_service.h" | 39 #include "chrome/browser/notifications/desktop_notification_service.h" |
| 40 #include "chrome/browser/notifications/notification_prefs_manager.h" | 40 #include "chrome/browser/notifications/notification_prefs_manager.h" |
| 41 #include "chrome/browser/page_info_model.h" | 41 #include "chrome/browser/page_info_model.h" |
| (...skipping 314 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 356 } | 356 } |
| 357 local_state->ClearPref(prefs::kLastPromptedGoogleURL); | 357 local_state->ClearPref(prefs::kLastPromptedGoogleURL); |
| 358 | 358 |
| 359 current_version |= GOOGLE_URL_TRACKER_PREFS; | 359 current_version |= GOOGLE_URL_TRACKER_PREFS; |
| 360 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 360 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
| 361 current_version); | 361 current_version); |
| 362 } | 362 } |
| 363 } | 363 } |
| 364 | 364 |
| 365 } // namespace chrome | 365 } // namespace chrome |
| OLD | NEW |