| 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 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 98 #include "components/autofill/core/browser/autofill_manager.h" | 98 #include "components/autofill/core/browser/autofill_manager.h" |
| 99 #include "components/user_prefs/pref_registry_syncable.h" | 99 #include "components/user_prefs/pref_registry_syncable.h" |
| 100 #include "content/public/browser/render_process_host.h" | 100 #include "content/public/browser/render_process_host.h" |
| 101 | 101 |
| 102 #if defined(ENABLE_AUTOFILL_DIALOG) | 102 #if defined(ENABLE_AUTOFILL_DIALOG) |
| 103 #include "chrome/browser/ui/autofill/autofill_dialog_controller.h" | 103 #include "chrome/browser/ui/autofill/autofill_dialog_controller.h" |
| 104 #endif | 104 #endif |
| 105 | 105 |
| 106 #if defined(ENABLE_CONFIGURATION_POLICY) | 106 #if defined(ENABLE_CONFIGURATION_POLICY) |
| 107 #include "chrome/browser/policy/browser_policy_connector.h" | 107 #include "chrome/browser/policy/browser_policy_connector.h" |
| 108 #include "chrome/browser/policy/policy_statistics_collector.h" | |
| 109 #include "chrome/browser/policy/url_blacklist_manager.h" | 108 #include "chrome/browser/policy/url_blacklist_manager.h" |
| 109 #include "components/policy/core/common/policy_statistics_collector.h" |
| 110 #endif | 110 #endif |
| 111 | 111 |
| 112 #if defined(ENABLE_MANAGED_USERS) | 112 #if defined(ENABLE_MANAGED_USERS) |
| 113 #include "chrome/browser/managed_mode/managed_user_service.h" | 113 #include "chrome/browser/managed_mode/managed_user_service.h" |
| 114 #include "chrome/browser/managed_mode/managed_user_sync_service.h" | 114 #include "chrome/browser/managed_mode/managed_user_sync_service.h" |
| 115 #endif | 115 #endif |
| 116 | 116 |
| 117 #if defined(ENABLE_MDNS) | 117 #if defined(ENABLE_MDNS) |
| 118 #include "chrome/browser/ui/webui/local_discovery/local_discovery_ui.h" | 118 #include "chrome/browser/ui/webui/local_discovery/local_discovery_ui.h" |
| 119 #endif | 119 #endif |
| (...skipping 440 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 560 } | 560 } |
| 561 local_state->ClearPref(prefs::kLastPromptedGoogleURL); | 561 local_state->ClearPref(prefs::kLastPromptedGoogleURL); |
| 562 | 562 |
| 563 current_version |= GOOGLE_URL_TRACKER_PREFS; | 563 current_version |= GOOGLE_URL_TRACKER_PREFS; |
| 564 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 564 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
| 565 current_version); | 565 current_version); |
| 566 } | 566 } |
| 567 } | 567 } |
| 568 | 568 |
| 569 } // namespace chrome | 569 } // namespace chrome |
| OLD | NEW |