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