diff options
| author | brettw <brettw@chromium.org> | 2015-10-09 14:30:46 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-09 21:31:32 +0000 |
| commit | e1f0af8b5a296f334fdeb0c6d7d2563a3fd95bc1 (patch) | |
| tree | 98af999b13adc270b3acfc0138ca075e825d5bb2 | |
| parent | ca46ae47bc66b875e5dacc554acd68500f92ccf8 (diff) | |
| download | chromium_src-e1f0af8b5a296f334fdeb0c6d7d2563a3fd95bc1.zip chromium_src-e1f0af8b5a296f334fdeb0c6d7d2563a3fd95bc1.tar.gz chromium_src-e1f0af8b5a296f334fdeb0c6d7d2563a3fd95bc1.tar.bz2 | |
Remove forward includes of component pref names in Chrome's list.
Previously chrome/common/pref_names.h included pref name headers from some components. Presumably these were added when the corresponding code was componentized to avoid updating all callers.
However, this causes problems for GN's dependency checker, which correctly identifies that these includes lack a dependency to go with them.
This removes the forward includes and adds the proper finer-grained includes where necessary. I tried to remove the include for pref_names.h in a few places where it is no longer needed.
Move some out
BUG=
Review URL: https://codereview.chromium.org/1395863003
Cr-Commit-Position: refs/heads/master@{#353388}
83 files changed, 97 insertions, 34 deletions
diff --git a/chrome/app/DEPS b/chrome/app/DEPS index ccf6eef..25d570c 100644 --- a/chrome/app/DEPS +++ b/chrome/app/DEPS @@ -14,7 +14,7 @@ include_rules = [ "+components/content_settings/core/common/content_settings_pattern.h", "+components/crash", "+components/browser_watcher", - "+components/metrics/client_info.h", + "+components/metrics", "+components/nacl/common", "+components/nacl/renderer/plugin/ppapi_entrypoints.h", "+components/nacl/zygote", diff --git a/chrome/app/chrome_crash_reporter_client.cc b/chrome/app/chrome_crash_reporter_client.cc index 1d057aa..aba2840 100644 --- a/chrome/app/chrome_crash_reporter_client.cc +++ b/chrome/app/chrome_crash_reporter_client.cc @@ -18,6 +18,7 @@ #include "chrome/common/crash_keys.h" #include "chrome/common/env_vars.h" #include "chrome/installer/util/google_update_settings.h" +#include "components/metrics/metrics_pref_names.h" #if defined(OS_WIN) #include <windows.h> diff --git a/chrome/browser/android/bookmarks/bookmarks_bridge.cc b/chrome/browser/android/bookmarks/bookmarks_bridge.cc index db7145a..2bdb56a 100644 --- a/chrome/browser/android/bookmarks/bookmarks_bridge.cc +++ b/chrome/browser/android/bookmarks/bookmarks_bridge.cc @@ -16,12 +16,12 @@ #include "chrome/browser/profiles/profile_android.h" #include "chrome/browser/signin/signin_manager_factory.h" #include "chrome/browser/undo/bookmark_undo_service_factory.h" -#include "chrome/common/pref_names.h" #include "components/bookmarks/browser/bookmark_match.h" #include "components/bookmarks/browser/bookmark_model.h" #include "components/bookmarks/browser/bookmark_utils.h" #include "components/bookmarks/browser/scoped_group_bookmark_actions.h" #include "components/bookmarks/common/android/bookmark_type.h" +#include "components/bookmarks/common/bookmark_pref_names.h" #include "components/bookmarks/managed/managed_bookmark_service.h" #include "components/enhanced_bookmarks/enhanced_bookmark_features.h" #include "components/query_parser/query_parser.h" diff --git a/chrome/browser/android/metrics/uma_session_stats.cc b/chrome/browser/android/metrics/uma_session_stats.cc index ba80cda..958a214 100644 --- a/chrome/browser/android/metrics/uma_session_stats.cc +++ b/chrome/browser/android/metrics/uma_session_stats.cc @@ -16,6 +16,7 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "chrome/installer/util/google_update_settings.h" +#include "components/metrics/metrics_pref_names.h" #include "components/metrics/metrics_service.h" #include "components/variations/metrics_util.h" #include "components/variations/variations_associated_data.h" diff --git a/chrome/browser/android/preferences/pref_service_bridge.cc b/chrome/browser/android/preferences/pref_service_bridge.cc index e5590bd..c2b2c58 100644 --- a/chrome/browser/android/preferences/pref_service_bridge.cc +++ b/chrome/browser/android/preferences/pref_service_bridge.cc @@ -31,7 +31,9 @@ #include "components/content_settings/core/common/content_settings.h" #include "components/content_settings/core/common/content_settings_pattern.h" #include "components/content_settings/core/common/pref_names.h" +#include "components/metrics/metrics_pref_names.h" #include "components/password_manager/core/common/password_manager_pref_names.h" +#include "components/signin/core/common/signin_pref_names.h" #include "components/translate/core/browser/translate_prefs.h" #include "components/translate/core/common/translate_pref_names.h" #include "components/version_info/version_info.h" diff --git a/chrome/browser/android/signin/signin_manager_android.cc b/chrome/browser/android/signin/signin_manager_android.cc index 439f0ac..be0e8c1 100644 --- a/chrome/browser/android/signin/signin_manager_android.cc +++ b/chrome/browser/android/signin/signin_manager_android.cc @@ -25,13 +25,13 @@ #include "chrome/browser/signin/oauth2_token_service_delegate_android.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" #include "chrome/browser/signin/signin_manager_factory.h" -#include "chrome/common/pref_names.h" #include "components/bookmarks/browser/bookmark_model.h" #include "components/signin/core/browser/account_tracker_service.h" #include "components/signin/core/browser/profile_oauth2_token_service.h" #include "components/signin/core/browser/signin_manager.h" #include "components/signin/core/browser/signin_metrics.h" #include "components/signin/core/common/profile_management_switches.h" +#include "components/signin/core/common/signin_pref_names.h" #include "google_apis/gaia/gaia_constants.h" #include "jni/SigninManager_jni.h" diff --git a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc index 30c5a7b..dd8ae4b 100644 --- a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc +++ b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc @@ -21,6 +21,7 @@ #include "chrome/browser/sync/profile_sync_service_factory.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" +#include "components/bookmarks/common/bookmark_pref_names.h" #include "components/history/core/browser/history_service.h" #include "components/omnibox/browser/autocomplete_classifier.h" #include "components/sync_driver/sync_service_utils.h" diff --git a/chrome/browser/autocomplete/search_provider_unittest.cc b/chrome/browser/autocomplete/search_provider_unittest.cc index 22dd22e..2b40c85 100644 --- a/chrome/browser/autocomplete/search_provider_unittest.cc +++ b/chrome/browser/autocomplete/search_provider_unittest.cc @@ -29,6 +29,7 @@ #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_profile.h" +#include "components/bookmarks/common/bookmark_pref_names.h" #include "components/google/core/browser/google_switches.h" #include "components/history/core/browser/history_service.h" #include "components/metrics/proto/omnibox_event.pb.h" diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc index b77777e..6615833 100644 --- a/chrome/browser/browser_process_impl.cc +++ b/chrome/browser/browser_process_impl.cc @@ -75,6 +75,7 @@ #include "chrome/installer/util/google_update_settings.h" #include "components/component_updater/component_updater_service.h" #include "components/gcm_driver/gcm_driver.h" +#include "components/metrics/metrics_pref_names.h" #include "components/metrics/metrics_service.h" #include "components/net_log/chrome_net_log.h" #include "components/network_time/network_time_tracker.h" diff --git a/chrome/browser/content_settings/content_settings_policy_provider_unittest.cc b/chrome/browser/content_settings/content_settings_policy_provider_unittest.cc index a40cdfb..619ab75 100644 --- a/chrome/browser/content_settings/content_settings_policy_provider_unittest.cc +++ b/chrome/browser/content_settings/content_settings_policy_provider_unittest.cc @@ -13,12 +13,12 @@ #include "base/prefs/pref_service.h" #include "chrome/browser/content_settings/content_settings_mock_observer.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" #include "chrome/test/base/testing_profile.h" #include "components/content_settings/core/browser/content_settings_rule.h" #include "components/content_settings/core/browser/content_settings_utils.h" #include "components/content_settings/core/common/content_settings_pattern.h" +#include "components/content_settings/core/common/pref_names.h" #include "components/content_settings/core/test/content_settings_test_utils.h" #include "components/syncable_prefs/testing_pref_service_syncable.h" #include "content/public/test/test_browser_thread_bundle.h" diff --git a/chrome/browser/content_settings/host_content_settings_map_unittest.cc b/chrome/browser/content_settings/host_content_settings_map_unittest.cc index 772215e..bac9de2 100644 --- a/chrome/browser/content_settings/host_content_settings_map_unittest.cc +++ b/chrome/browser/content_settings/host_content_settings_map_unittest.cc @@ -13,7 +13,6 @@ #include "chrome/browser/content_settings/cookie_settings_factory.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h" #include "chrome/browser/content_settings/mock_settings_observer.h" -#include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" #include "chrome/test/base/testing_profile.h" #include "components/content_settings/core/browser/content_settings_details.h" @@ -21,6 +20,7 @@ #include "components/content_settings/core/browser/host_content_settings_map.h" #include "components/content_settings/core/browser/website_settings_info.h" #include "components/content_settings/core/browser/website_settings_registry.h" +#include "components/content_settings/core/common/pref_names.h" #include "components/syncable_prefs/testing_pref_service_syncable.h" #include "content/public/test/test_browser_thread.h" #include "net/base/static_cookie_policy.h" diff --git a/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc b/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc index 7820372..14b2a4e 100644 --- a/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc +++ b/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc @@ -23,12 +23,12 @@ #include "chrome/browser/ui/bookmarks/bookmark_drag_drop.h" #include "chrome/browser/undo/bookmark_undo_service_factory.h" #include "chrome/common/extensions/api/bookmark_manager_private.h" -#include "chrome/common/pref_names.h" #include "chrome/grit/generated_resources.h" #include "components/bookmarks/browser/bookmark_model.h" #include "components/bookmarks/browser/bookmark_node_data.h" #include "components/bookmarks/browser/bookmark_utils.h" #include "components/bookmarks/browser/scoped_group_bookmark_actions.h" +#include "components/bookmarks/common/bookmark_pref_names.h" #include "components/bookmarks/managed/managed_bookmark_service.h" #include "components/enhanced_bookmarks/enhanced_bookmark_model.h" #include "components/undo/bookmark_undo_service.h" diff --git a/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc b/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc index e7329ef..7096759 100644 --- a/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc +++ b/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc @@ -37,6 +37,7 @@ #include "chrome/grit/generated_resources.h" #include "components/bookmarks/browser/bookmark_model.h" #include "components/bookmarks/browser/bookmark_utils.h" +#include "components/bookmarks/common/bookmark_pref_names.h" #include "components/bookmarks/managed/managed_bookmark_service.h" #include "components/user_prefs/user_prefs.h" #include "content/public/browser/browser_context.h" diff --git a/chrome/browser/extensions/api/preference/preference_api.cc b/chrome/browser/extensions/api/preference/preference_api.cc index c28969e..fa7e869 100644 --- a/chrome/browser/extensions/api/preference/preference_api.cc +++ b/chrome/browser/extensions/api/preference/preference_api.cc @@ -22,7 +22,10 @@ #include "chrome/browser/net/prediction_options.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/pref_names.h" +#include "components/autofill/core/common/autofill_pref_names.h" #include "components/content_settings/core/common/pref_names.h" +#include "components/data_reduction_proxy/core/common/data_reduction_proxy_pref_names.h" +#include "components/password_manager/core/common/password_manager_pref_names.h" #include "components/proxy_config/proxy_config_pref_names.h" #include "components/translate/core/common/translate_pref_names.h" #include "content/public/browser/notification_details.h" diff --git a/chrome/browser/extensions/api/preference/preference_apitest.cc b/chrome/browser/extensions/api/preference/preference_apitest.cc index 6ef8baf..f9461a4 100644 --- a/chrome/browser/extensions/api/preference/preference_apitest.cc +++ b/chrome/browser/extensions/api/preference/preference_apitest.cc @@ -16,7 +16,9 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/ui_test_utils.h" +#include "components/autofill/core/common/autofill_pref_names.h" #include "components/content_settings/core/common/pref_names.h" +#include "components/password_manager/core/common/password_manager_pref_names.h" #include "components/translate/core/common/translate_pref_names.h" #include "content/public/browser/notification_service.h" #include "extensions/browser/extension_registry.h" diff --git a/chrome/browser/first_run/first_run_internal_posix.cc b/chrome/browser/first_run/first_run_internal_posix.cc index 6e97dd8..6fb649f 100644 --- a/chrome/browser/first_run/first_run_internal_posix.cc +++ b/chrome/browser/first_run/first_run_internal_posix.cc @@ -13,9 +13,9 @@ #include "chrome/browser/first_run/first_run_dialog.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_paths.h" -#include "chrome/common/pref_names.h" #include "chrome/installer/util/google_update_settings.h" #include "chrome/installer/util/master_preferences.h" +#include "components/metrics/metrics_pref_names.h" #include "components/startup_metric_utils/startup_metric_utils.h" namespace first_run { diff --git a/chrome/browser/importer/profile_writer.cc b/chrome/browser/importer/profile_writer.cc index 2eb88eb..b7a21ca 100644 --- a/chrome/browser/importer/profile_writer.cc +++ b/chrome/browser/importer/profile_writer.cc @@ -25,6 +25,7 @@ #include "chrome/common/pref_names.h" #include "components/autofill/core/browser/webdata/autofill_webdata_service.h" #include "components/bookmarks/browser/bookmark_model.h" +#include "components/bookmarks/common/bookmark_pref_names.h" #include "components/favicon/core/favicon_service.h" #include "components/history/core/browser/history_service.h" #include "components/password_manager/core/browser/password_store.h" diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc index 165bf37..a050cb0 100644 --- a/chrome/browser/io_thread.cc +++ b/chrome/browser/io_thread.cc @@ -40,6 +40,7 @@ #include "chrome/common/pref_names.h" #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_prefs.h" #include "components/data_reduction_proxy/core/common/data_reduction_proxy_params.h" +#include "components/data_reduction_proxy/core/common/data_reduction_proxy_pref_names.h" #include "components/data_usage/core/data_use_aggregator.h" #include "components/net_log/chrome_net_log.h" #include "components/policy/core/common/policy_service.h" diff --git a/chrome/browser/metrics/chrome_metrics_service_accessor_unittest.cc b/chrome/browser/metrics/chrome_metrics_service_accessor_unittest.cc index 1084714..983aba9 100644 --- a/chrome/browser/metrics/chrome_metrics_service_accessor_unittest.cc +++ b/chrome/browser/metrics/chrome_metrics_service_accessor_unittest.cc @@ -9,6 +9,7 @@ #include "chrome/common/pref_names.h" #include "chrome/test/base/scoped_testing_local_state.h" #include "chrome/test/base/testing_browser_process.h" +#include "components/metrics/metrics_pref_names.h" #include "content/public/test/test_browser_thread_bundle.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/metrics/chrome_metrics_service_client.cc b/chrome/browser/metrics/chrome_metrics_service_client.cc index 0ac839f..67dec95 100644 --- a/chrome/browser/metrics/chrome_metrics_service_client.cc +++ b/chrome/browser/metrics/chrome_metrics_service_client.cc @@ -32,6 +32,7 @@ #include "components/metrics/call_stack_profile_metrics_provider.h" #include "components/metrics/drive_metrics_provider.h" #include "components/metrics/gpu/gpu_metrics_provider.h" +#include "components/metrics/metrics_pref_names.h" #include "components/metrics/metrics_service.h" #include "components/metrics/net/net_metrics_log_uploader.h" #include "components/metrics/net/network_metrics_provider.h" diff --git a/chrome/browser/metrics/metrics_reporting_state.cc b/chrome/browser/metrics/metrics_reporting_state.cc index e9d658e..0666443a 100644 --- a/chrome/browser/metrics/metrics_reporting_state.cc +++ b/chrome/browser/metrics/metrics_reporting_state.cc @@ -9,8 +9,8 @@ #include "base/prefs/pref_service.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/metrics/chrome_metrics_service_accessor.h" -#include "chrome/common/pref_names.h" #include "chrome/installer/util/google_update_settings.h" +#include "components/metrics/metrics_pref_names.h" #include "components/metrics/metrics_service.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/metrics/metrics_service_browsertest.cc b/chrome/browser/metrics/metrics_service_browsertest.cc index b3ca37f..13e8a67 100644 --- a/chrome/browser/metrics/metrics_service_browsertest.cc +++ b/chrome/browser/metrics/metrics_service_browsertest.cc @@ -18,10 +18,10 @@ #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" +#include "components/metrics/metrics_pref_names.h" #include "content/public/test/browser_test_utils.h" #include "net/base/filename_util.h" #include "ui/base/window_open_disposition.h" diff --git a/chrome/browser/net/spdyproxy/data_reduction_proxy_settings_android.cc b/chrome/browser/net/spdyproxy/data_reduction_proxy_settings_android.cc index da7995e..cbd5130 100644 --- a/chrome/browser/net/spdyproxy/data_reduction_proxy_settings_android.cc +++ b/chrome/browser/net/spdyproxy/data_reduction_proxy_settings_android.cc @@ -15,6 +15,7 @@ #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_metrics.h" #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_settings.h" #include "components/data_reduction_proxy/core/common/data_reduction_proxy_event_store.h" +#include "components/data_reduction_proxy/core/common/data_reduction_proxy_pref_names.h" #include "jni/DataReductionProxySettings_jni.h" #include "net/proxy/proxy_server.h" #include "url/gurl.h" diff --git a/chrome/browser/net/spdyproxy/data_reduction_proxy_settings_unittest_android.cc b/chrome/browser/net/spdyproxy/data_reduction_proxy_settings_unittest_android.cc index e7c55cb..f762b2e 100644 --- a/chrome/browser/net/spdyproxy/data_reduction_proxy_settings_unittest_android.cc +++ b/chrome/browser/net/spdyproxy/data_reduction_proxy_settings_unittest_android.cc @@ -21,6 +21,7 @@ #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_test_utils.h" #include "components/data_reduction_proxy/core/common/data_reduction_proxy_params.h" #include "components/data_reduction_proxy/core/common/data_reduction_proxy_params_test_utils.h" +#include "components/data_reduction_proxy/core/common/data_reduction_proxy_pref_names.h" #include "components/proxy_config/proxy_prefs.h" #include "net/proxy/proxy_server.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/chrome/browser/plugins/plugin_info_message_filter_unittest.cc b/chrome/browser/plugins/plugin_info_message_filter_unittest.cc index d9bbb9e..0cbb688 100644 --- a/chrome/browser/plugins/plugin_info_message_filter_unittest.cc +++ b/chrome/browser/plugins/plugin_info_message_filter_unittest.cc @@ -15,6 +15,7 @@ #include "chrome/common/render_messages.h" #include "chrome/test/base/testing_profile.h" #include "components/content_settings/core/browser/host_content_settings_map.h" +#include "components/content_settings/core/common/pref_names.h" #include "components/syncable_prefs/testing_pref_service_syncable.h" #include "content/public/browser/plugin_service.h" #include "content/public/browser/plugin_service_filter.h" diff --git a/chrome/browser/policy/configuration_policy_handler_list_factory.cc b/chrome/browser/policy/configuration_policy_handler_list_factory.cc index 8c80ebc..5568846 100644 --- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc +++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc @@ -13,7 +13,10 @@ #include "chrome/browser/profiles/incognito_mode_policy_handler.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" +#include "components/bookmarks/common/bookmark_pref_names.h" #include "components/content_settings/core/common/pref_names.h" +#include "components/data_reduction_proxy/core/common/data_reduction_proxy_pref_names.h" +#include "components/metrics/metrics_pref_names.h" #include "components/password_manager/core/common/password_manager_pref_names.h" #include "components/policy/core/browser/autofill_policy_handler.h" #include "components/policy/core/browser/configuration_policy_handler.h" @@ -26,6 +29,7 @@ #include "components/policy/core/common/policy_pref_names.h" #include "components/policy/core/common/schema.h" #include "components/search_engines/default_search_policy_handler.h" +#include "components/signin/core/common/signin_pref_names.h" #include "components/translate/core/common/translate_pref_names.h" #include "components/variations/pref_names.h" #include "policy/policy_constants.h" diff --git a/chrome/browser/policy/javascript_policy_handler.cc b/chrome/browser/policy/javascript_policy_handler.cc index 69aa106..3b31e66 100644 --- a/chrome/browser/policy/javascript_policy_handler.cc +++ b/chrome/browser/policy/javascript_policy_handler.cc @@ -6,8 +6,8 @@ #include "base/prefs/pref_value_map.h" #include "base/values.h" -#include "chrome/common/pref_names.h" #include "components/content_settings/core/common/content_settings.h" +#include "components/content_settings/core/common/pref_names.h" #include "components/policy/core/browser/policy_error_map.h" #include "components/policy/core/common/policy_map.h" #include "grit/components_strings.h" diff --git a/chrome/browser/policy/javascript_policy_handler_unittest.cc b/chrome/browser/policy/javascript_policy_handler_unittest.cc index a741c05..26c35db 100644 --- a/chrome/browser/policy/javascript_policy_handler_unittest.cc +++ b/chrome/browser/policy/javascript_policy_handler_unittest.cc @@ -3,8 +3,8 @@ // found in the LICENSE file. #include "chrome/browser/policy/javascript_policy_handler.h" -#include "chrome/common/pref_names.h" #include "components/content_settings/core/common/content_settings.h" +#include "components/content_settings/core/common/pref_names.h" #include "components/policy/core/browser/configuration_policy_pref_store.h" #include "components/policy/core/browser/configuration_policy_pref_store_test.h" #include "components/policy/core/browser/policy_error_map.h" diff --git a/chrome/browser/policy/policy_browsertest.cc b/chrome/browser/policy/policy_browsertest.cc index d4b38f3..6fa57f2 100644 --- a/chrome/browser/policy/policy_browsertest.cc +++ b/chrome/browser/policy/policy_browsertest.cc @@ -88,8 +88,10 @@ #include "chrome/test/base/search_test_utils.h" #include "chrome/test/base/test_switches.h" #include "chrome/test/base/ui_test_utils.h" +#include "components/bookmarks/common/bookmark_pref_names.h" #include "components/content_settings/core/common/content_settings.h" #include "components/content_settings/core/common/content_settings_pattern.h" +#include "components/content_settings/core/common/pref_names.h" #include "components/infobars/core/infobar.h" #include "components/omnibox/browser/autocomplete_controller.h" #include "components/omnibox/browser/omnibox_edit_model.h" diff --git a/chrome/browser/prefs/chrome_pref_service_factory.cc b/chrome/browser/prefs/chrome_pref_service_factory.cc index 95f26a0..b7c22fb 100644 --- a/chrome/browser/prefs/chrome_pref_service_factory.cc +++ b/chrome/browser/prefs/chrome_pref_service_factory.cc @@ -41,6 +41,7 @@ #include "components/search_engines/default_search_manager.h" #include "components/search_engines/default_search_pref_migration.h" #include "components/search_engines/search_engines_pref_names.h" +#include "components/signin/core/common/signin_pref_names.h" #include "components/sync_driver/pref_names.h" #include "components/syncable_prefs/pref_model_associator.h" #include "components/syncable_prefs/pref_service_syncable.h" diff --git a/chrome/browser/prefs/command_line_pref_store.cc b/chrome/browser/prefs/command_line_pref_store.cc index 687bd27..6908b25 100644 --- a/chrome/browser/prefs/command_line_pref_store.cc +++ b/chrome/browser/prefs/command_line_pref_store.cc @@ -15,6 +15,7 @@ #include "base/values.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" +#include "components/data_reduction_proxy/core/common/data_reduction_proxy_pref_names.h" #include "components/data_reduction_proxy/core/common/data_reduction_proxy_switches.h" #include "components/proxy_config/proxy_config_dictionary.h" #include "components/proxy_config/proxy_config_pref_names.h" diff --git a/chrome/browser/prefs/pref_functional_browsertest.cc b/chrome/browser/prefs/pref_functional_browsertest.cc index 0127db2..55b93a9 100644 --- a/chrome/browser/prefs/pref_functional_browsertest.cc +++ b/chrome/browser/prefs/pref_functional_browsertest.cc @@ -16,9 +16,11 @@ #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_profile.h" #include "chrome/test/base/ui_test_utils.h" +#include "components/bookmarks/common/bookmark_pref_names.h" #include "components/content_settings/core/browser/website_settings_info.h" #include "components/content_settings/core/browser/website_settings_registry.h" #include "components/content_settings/core/common/content_settings_types.h" +#include "components/content_settings/core/common/pref_names.h" #include "components/syncable_prefs/pref_service_syncable.h" #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" diff --git a/chrome/browser/profiles/gaia_info_update_service.cc b/chrome/browser/profiles/gaia_info_update_service.cc index 8828b4b..0c8115c 100644 --- a/chrome/browser/profiles/gaia_info_update_service.cc +++ b/chrome/browser/profiles/gaia_info_update_service.cc @@ -16,6 +16,7 @@ #include "chrome/browser/signin/signin_manager_factory.h" #include "chrome/common/pref_names.h" #include "components/signin/core/common/profile_management_switches.h" +#include "components/signin/core/common/signin_pref_names.h" #include "content/public/browser/notification_details.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/gfx/image/image.h" diff --git a/chrome/browser/profiles/gaia_info_update_service_unittest.cc b/chrome/browser/profiles/gaia_info_update_service_unittest.cc index 2a69f28..914f824 100644 --- a/chrome/browser/profiles/gaia_info_update_service_unittest.cc +++ b/chrome/browser/profiles/gaia_info_update_service_unittest.cc @@ -20,6 +20,7 @@ #include "chrome/test/base/testing_profile.h" #include "chrome/test/base/testing_profile_manager.h" #include "components/signin/core/browser/account_tracker_service.h" +#include "components/signin/core/common/signin_pref_names.h" #include "components/syncable_prefs/pref_service_syncable.h" #include "testing/gmock/include/gmock/gmock.h" #include "ui/gfx/image/image.h" diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc index 5c659b6..6338f97 100644 --- a/chrome/browser/profiles/profile_impl.cc +++ b/chrome/browser/profiles/profile_impl.cc @@ -90,6 +90,7 @@ #include "components/pref_registry/pref_registry_syncable.h" #include "components/proxy_config/pref_proxy_config_tracker.h" #include "components/signin/core/browser/signin_manager.h" +#include "components/signin/core/common/signin_pref_names.h" #include "components/syncable_prefs/pref_service_syncable.h" #include "components/ui/zoom/zoom_event_manager.h" #include "components/url_formatter/url_fixer.h" diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc index 1087cba..9150d98 100644 --- a/chrome/browser/profiles/profile_io_data.cc +++ b/chrome/browser/profiles/profile_io_data.cc @@ -56,7 +56,9 @@ #include "components/content_settings/core/browser/host_content_settings_map.h" #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_io_data.h" #include "components/dom_distiller/core/url_constants.h" +#include "components/metrics/metrics_pref_names.h" #include "components/net_log/chrome_net_log.h" +#include "components/signin/core/common/signin_pref_names.h" #include "components/sync_driver/pref_names.h" #include "components/url_formatter/url_fixer.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profiles/profile_manager.cc index d14137f..870e821 100644 --- a/chrome/browser/profiles/profile_manager.cc +++ b/chrome/browser/profiles/profile_manager.cc @@ -58,6 +58,7 @@ #include "chrome/grit/generated_resources.h" #include "components/bookmarks/browser/bookmark_model.h" #include "components/bookmarks/browser/startup_task_runner_service.h" +#include "components/bookmarks/common/bookmark_pref_names.h" #include "components/content_settings/core/browser/host_content_settings_map.h" #include "components/password_manager/core/browser/password_store.h" #include "components/signin/core/browser/account_fetcher_service.h" @@ -65,6 +66,7 @@ #include "components/signin/core/browser/gaia_cookie_manager_service.h" #include "components/signin/core/browser/signin_manager.h" #include "components/signin/core/common/profile_management_switches.h" +#include "components/signin/core/common/signin_pref_names.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/user_metrics.h" diff --git a/chrome/browser/profiles/profile_window.cc b/chrome/browser/profiles/profile_window.cc index 4de2f78..3cd7828 100644 --- a/chrome/browser/profiles/profile_window.cc +++ b/chrome/browser/profiles/profile_window.cc @@ -32,6 +32,7 @@ #include "components/signin/core/browser/account_tracker_service.h" #include "components/signin/core/browser/signin_manager.h" #include "components/signin/core/common/profile_management_switches.h" +#include "components/signin/core/common/signin_pref_names.h" #include "components/signin/core/common/signin_switches.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/user_metrics.h" diff --git a/chrome/browser/profiles/profiles_state.cc b/chrome/browser/profiles/profiles_state.cc index 1c13619..a26a571 100644 --- a/chrome/browser/profiles/profiles_state.cc +++ b/chrome/browser/profiles/profiles_state.cc @@ -24,6 +24,7 @@ #include "chrome/grit/generated_resources.h" #include "components/signin/core/browser/profile_oauth2_token_service.h" #include "components/signin/core/common/profile_management_switches.h" +#include "components/signin/core/common/signin_pref_names.h" #include "content/public/browser/resource_dispatcher_host.h" #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/text_elider.h" diff --git a/chrome/browser/signin/signin_manager_unittest.cc b/chrome/browser/signin/signin_manager_unittest.cc index 745e1ba..48b39a8 100644 --- a/chrome/browser/signin/signin_manager_unittest.cc +++ b/chrome/browser/signin/signin_manager_unittest.cc @@ -37,6 +37,7 @@ #include "components/signin/core/browser/fake_profile_oauth2_token_service.h" #include "components/signin/core/browser/profile_oauth2_token_service.h" #include "components/signin/core/browser/test_signin_client.h" +#include "components/signin/core/common/signin_pref_names.h" #include "content/public/browser/child_process_security_policy.h" #include "content/public/browser/notification_source.h" #include "content/public/test/test_browser_thread_bundle.h" diff --git a/chrome/browser/supervised_user/child_accounts/child_account_service.cc b/chrome/browser/supervised_user/child_accounts/child_account_service.cc index a523f62..6149a25 100644 --- a/chrome/browser/supervised_user/child_accounts/child_account_service.cc +++ b/chrome/browser/supervised_user/child_accounts/child_account_service.cc @@ -26,6 +26,7 @@ #include "components/pref_registry/pref_registry_syncable.h" #include "components/signin/core/browser/profile_oauth2_token_service.h" #include "components/signin/core/browser/signin_manager.h" +#include "components/signin/core/common/signin_pref_names.h" #if defined(OS_CHROMEOS) #include "chrome/browser/chromeos/profiles/profile_helper.h" diff --git a/chrome/browser/supervised_user/supervised_user_pref_store.cc b/chrome/browser/supervised_user/supervised_user_pref_store.cc index 376bacb..c0e6179 100644 --- a/chrome/browser/supervised_user/supervised_user_pref_store.cc +++ b/chrome/browser/supervised_user/supervised_user_pref_store.cc @@ -19,6 +19,7 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "components/bookmarks/common/bookmark_pref_names.h" +#include "components/signin/core/common/signin_pref_names.h" #include "content/public/browser/notification_source.h" namespace { diff --git a/chrome/browser/sync/profile_sync_service_startup_unittest.cc b/chrome/browser/sync/profile_sync_service_startup_unittest.cc index fe5ff5c..bcac68a 100644 --- a/chrome/browser/sync/profile_sync_service_startup_unittest.cc +++ b/chrome/browser/sync/profile_sync_service_startup_unittest.cc @@ -25,6 +25,7 @@ #include "components/signin/core/browser/fake_profile_oauth2_token_service.h" #include "components/signin/core/browser/profile_oauth2_token_service.h" #include "components/signin/core/browser/signin_manager.h" +#include "components/signin/core/common/signin_pref_names.h" #include "components/sync_driver/data_type_manager.h" #include "components/sync_driver/data_type_manager_mock.h" #include "components/sync_driver/pref_names.h" diff --git a/chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc b/chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc index 36e6201..7cca365 100644 --- a/chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc +++ b/chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc @@ -37,8 +37,10 @@ #include "components/autofill/core/browser/autofill_test_utils.h" #include "components/autofill/core/browser/test_personal_data_manager.h" #include "components/autofill/core/browser/webdata/autofill_webdata_service.h" +#include "components/autofill/core/common/autofill_pref_names.h" #include "components/autofill/core/common/autofill_switches.h" #include "components/autofill/core/common/form_data.h" +#include "components/bookmarks/common/bookmark_pref_names.h" #include "components/signin/core/browser/account_tracker_service.h" #include "components/user_prefs/user_prefs.h" #include "content/public/browser/web_contents.h" diff --git a/chrome/browser/ui/bookmarks/bookmark_context_menu_controller.cc b/chrome/browser/ui/bookmarks/bookmark_context_menu_controller.cc index 9ca97a5..7a2ba5c 100644 --- a/chrome/browser/ui/bookmarks/bookmark_context_menu_controller.cc +++ b/chrome/browser/ui/bookmarks/bookmark_context_menu_controller.cc @@ -20,11 +20,11 @@ #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/browser/undo/bookmark_undo_service_factory.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/pref_names.h" #include "chrome/grit/generated_resources.h" #include "components/bookmarks/browser/bookmark_client.h" #include "components/bookmarks/browser/bookmark_model.h" #include "components/bookmarks/browser/bookmark_utils.h" +#include "components/bookmarks/common/bookmark_pref_names.h" #include "components/bookmarks/managed/managed_bookmark_service.h" #include "components/undo/bookmark_undo_service.h" #include "content/public/browser/page_navigator.h" diff --git a/chrome/browser/ui/bookmarks/bookmark_context_menu_controller_unittest.cc b/chrome/browser/ui/bookmarks/bookmark_context_menu_controller_unittest.cc index a1d7a17..9325f96 100644 --- a/chrome/browser/ui/bookmarks/bookmark_context_menu_controller_unittest.cc +++ b/chrome/browser/ui/bookmarks/bookmark_context_menu_controller_unittest.cc @@ -14,10 +14,10 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/bookmarks/bookmark_utils.h" #include "chrome/browser/ui/bookmarks/bookmark_utils_desktop.h" -#include "chrome/common/pref_names.h" #include "chrome/test/base/testing_profile.h" #include "components/bookmarks/browser/bookmark_model.h" #include "components/bookmarks/browser/bookmark_node.h" +#include "components/bookmarks/common/bookmark_pref_names.h" #include "components/bookmarks/test/bookmark_test_helpers.h" #include "components/syncable_prefs/testing_pref_service_syncable.h" #include "content/public/browser/page_navigator.h" diff --git a/chrome/browser/ui/bookmarks/bookmark_tab_helper.cc b/chrome/browser/ui/bookmarks/bookmark_tab_helper.cc index 0672340..b555bf2 100644 --- a/chrome/browser/ui/bookmarks/bookmark_tab_helper.cc +++ b/chrome/browser/ui/bookmarks/bookmark_tab_helper.cc @@ -12,8 +12,8 @@ #include "chrome/browser/ui/bookmarks/bookmark_utils.h" #include "chrome/browser/ui/sad_tab.h" #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" -#include "chrome/common/pref_names.h" #include "components/bookmarks/browser/bookmark_model.h" +#include "components/bookmarks/common/bookmark_pref_names.h" #include "components/syncable_prefs/pref_service_syncable.h" #include "content/public/browser/navigation_entry.h" #include "content/public/browser/web_contents.h" diff --git a/chrome/browser/ui/bookmarks/bookmark_utils.cc b/chrome/browser/ui/bookmarks/bookmark_utils.cc index dde64ac..7e5560d 100644 --- a/chrome/browser/ui/bookmarks/bookmark_utils.cc +++ b/chrome/browser/ui/bookmarks/bookmark_utils.cc @@ -14,6 +14,7 @@ #include "chrome/common/url_constants.h" #include "components/bookmarks/browser/bookmark_model.h" #include "components/bookmarks/browser/bookmark_node_data.h" +#include "components/bookmarks/common/bookmark_pref_names.h" #include "components/search/search.h" #include "components/url_formatter/url_formatter.h" #include "components/user_prefs/user_prefs.h" diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc index 584a1d6..6fa115c 100644 --- a/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc @@ -157,6 +157,7 @@ #include "components/app_modal/javascript_dialog_manager.h" #include "components/bookmarks/browser/bookmark_model.h" #include "components/bookmarks/browser/bookmark_utils.h" +#include "components/bookmarks/common/bookmark_pref_names.h" #include "components/content_settings/core/browser/host_content_settings_map.h" #include "components/favicon/content/content_favicon_driver.h" #include "components/history/core/browser/top_sites.h" diff --git a/chrome/browser/ui/browser_command_controller.cc b/chrome/browser/ui/browser_command_controller.cc index 395cdc9..a87d2e9 100644 --- a/chrome/browser/ui/browser_command_controller.cc +++ b/chrome/browser/ui/browser_command_controller.cc @@ -32,8 +32,10 @@ #include "chrome/common/content_restriction.h" #include "chrome/common/pref_names.h" #include "chrome/common/profiling.h" +#include "components/bookmarks/common/bookmark_pref_names.h" #include "components/dom_distiller/core/dom_distiller_switches.h" #include "components/sessions/core/tab_restore_service.h" +#include "components/signin/core/common/signin_pref_names.h" #include "content/public/browser/native_web_keyboard_event.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/navigation_entry.h" diff --git a/chrome/browser/ui/browser_command_controller_unittest.cc b/chrome/browser/ui/browser_command_controller_unittest.cc index c6c9a90..69533b3 100644 --- a/chrome/browser/ui/browser_command_controller_unittest.cc +++ b/chrome/browser/ui/browser_command_controller_unittest.cc @@ -24,6 +24,7 @@ #include "chrome/test/base/testing_profile.h" #include "chrome/test/base/testing_profile_manager.h" #include "components/signin/core/common/profile_management_switches.h" +#include "components/signin/core/common/signin_pref_names.h" #include "content/public/browser/native_web_keyboard_event.h" #include "ui/events/keycodes/keyboard_codes.h" diff --git a/chrome/browser/ui/browser_commands.cc b/chrome/browser/ui/browser_commands.cc index b67f11a..4df5abb 100644 --- a/chrome/browser/ui/browser_commands.cc +++ b/chrome/browser/ui/browser_commands.cc @@ -55,6 +55,7 @@ #include "chrome/common/pref_names.h" #include "components/bookmarks/browser/bookmark_model.h" #include "components/bookmarks/browser/bookmark_utils.h" +#include "components/bookmarks/common/bookmark_pref_names.h" #include "components/favicon/content/content_favicon_driver.h" #include "components/google/core/browser/google_util.h" #include "components/sessions/core/live_tab_context.h" diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge.mm index cac5437..fedc42e 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge.mm @@ -8,8 +8,8 @@ #include "base/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h" -#include "chrome/common/pref_names.h" #include "components/bookmarks/browser/bookmark_model.h" +#include "components/bookmarks/common/bookmark_pref_names.h" using bookmarks::BookmarkModel; using bookmarks::BookmarkNode; diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm index 6e3f50a..96aedc5 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm @@ -47,12 +47,12 @@ #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/extension_metrics.h" -#include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" #include "chrome/grit/generated_resources.h" #include "components/bookmarks/browser/bookmark_model.h" #include "components/bookmarks/browser/bookmark_node_data.h" #include "components/bookmarks/browser/bookmark_utils.h" +#include "components/bookmarks/common/bookmark_pref_names.h" #include "components/bookmarks/managed/managed_bookmark_service.h" #include "content/public/browser/user_metrics.h" #include "content/public/browser/web_contents.h" diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm index 7f42e9b..d1b3804 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm @@ -25,10 +25,10 @@ #include "chrome/browser/ui/cocoa/cocoa_profile_test.h" #import "chrome/browser/ui/cocoa/view_resizer_pong.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/pref_names.h" #include "chrome/test/base/testing_profile.h" #include "components/bookmarks/browser/bookmark_model.h" #include "components/bookmarks/browser/bookmark_utils.h" +#include "components/bookmarks/common/bookmark_pref_names.h" #include "components/bookmarks/test/bookmark_test_helpers.h" #include "components/syncable_prefs/testing_pref_service_syncable.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/ui/cocoa/browser_window_cocoa.mm b/chrome/browser/ui/cocoa/browser_window_cocoa.mm index a3716da..bbb826e 100644 --- a/chrome/browser/ui/cocoa/browser_window_cocoa.mm +++ b/chrome/browser/ui/cocoa/browser_window_cocoa.mm @@ -54,6 +54,7 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "chrome/grit/generated_resources.h" +#include "components/bookmarks/common/bookmark_pref_names.h" #include "components/translate/core/browser/language_state.h" #include "content/public/browser/native_web_keyboard_event.h" #include "content/public/browser/notification_details.h" diff --git a/chrome/browser/ui/cocoa/browser_window_controller_unittest.mm b/chrome/browser/ui/cocoa/browser_window_controller_unittest.mm index 9bc2ce5..6ab0abf 100644 --- a/chrome/browser/ui/cocoa/browser_window_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/browser_window_controller_unittest.mm @@ -21,6 +21,7 @@ #include "chrome/browser/ui/host_desktop.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_profile.h" +#include "components/bookmarks/common/bookmark_pref_names.h" #include "content/public/browser/notification_service.h" #include "content/public/test/test_utils.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/chrome/browser/ui/cocoa/first_run_dialog.mm b/chrome/browser/ui/cocoa/first_run_dialog.mm index b92fce9..d6946e4 100644 --- a/chrome/browser/ui/cocoa/first_run_dialog.mm +++ b/chrome/browser/ui/cocoa/first_run_dialog.mm @@ -17,6 +17,7 @@ #include "chrome/browser/shell_integration.h" #include "chrome/common/channel_info.h" #include "chrome/common/url_constants.h" +#include "components/metrics/metrics_pref_names.h" #include "components/search_engines/template_url_service.h" #include "components/version_info/version_info.h" #import "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutTweaker.h" diff --git a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm index 3417aa7..b53cca6 100644 --- a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm +++ b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm @@ -53,6 +53,7 @@ #include "chrome/browser/ui/toolbar/chrome_toolbar_model.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" +#include "components/bookmarks/common/bookmark_pref_names.h" #import "components/omnibox/browser/omnibox_popup_model.h" #include "components/search_engines/template_url.h" #include "components/search_engines/template_url_service.h" diff --git a/chrome/browser/ui/cocoa/profiles/profile_chooser_controller_unittest.mm b/chrome/browser/ui/cocoa/profiles/profile_chooser_controller_unittest.mm index af7d97c..ee721b0 100644 --- a/chrome/browser/ui/cocoa/profiles/profile_chooser_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/profiles/profile_chooser_controller_unittest.mm @@ -30,6 +30,7 @@ #include "components/signin/core/browser/profile_oauth2_token_service.h" #include "components/signin/core/browser/signin_manager.h" #include "components/signin/core/common/profile_management_switches.h" +#include "components/signin/core/common/signin_pref_names.h" #include "components/syncable_prefs/pref_service_syncable.h" const std::string kGaiaId = "gaiaid-user@gmail.com"; diff --git a/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc b/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc index 725c4d4..2983e88 100644 --- a/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc +++ b/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc @@ -41,6 +41,7 @@ #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/test_switches.h" #include "chrome/test/base/ui_test_utils.h" +#include "components/metrics/metrics_pref_names.h" #include "content/public/browser/web_contents.h" #include "content/public/test/test_utils.h" #include "extensions/browser/extension_system.h" diff --git a/chrome/browser/ui/toolbar/wrench_menu_model.cc b/chrome/browser/ui/toolbar/wrench_menu_model.cc index 7bbdb3c..08d6b93 100644 --- a/chrome/browser/ui/toolbar/wrench_menu_model.cc +++ b/chrome/browser/ui/toolbar/wrench_menu_model.cc @@ -40,10 +40,10 @@ #include "chrome/browser/upgrade_detector.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/pref_names.h" #include "chrome/common/profiling.h" #include "chrome/grit/chromium_strings.h" #include "chrome/grit/generated_resources.h" +#include "components/bookmarks/common/bookmark_pref_names.h" #include "components/dom_distiller/core/dom_distiller_switches.h" #include "components/signin/core/browser/signin_manager.h" #include "components/signin/core/common/profile_management_switches.h" diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc index d09dd1f..7a1b53f 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc @@ -52,6 +52,7 @@ #include "chrome/grit/generated_resources.h" #include "components/bookmarks/browser/bookmark_model.h" #include "components/bookmarks/browser/bookmark_utils.h" +#include "components/bookmarks/common/bookmark_pref_names.h" #include "components/bookmarks/managed/managed_bookmark_service.h" #include "components/metrics/metrics_service.h" #include "components/omnibox/browser/omnibox_popup_model.h" diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc index 56449a6..9ef338c 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc @@ -25,7 +25,6 @@ #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h" #include "chrome/browser/ui/views/chrome_constrained_window_views_client.h" #include "chrome/common/chrome_content_client.h" -#include "chrome/common/pref_names.h" #include "chrome/test/base/interactive_test_utils.h" #include "chrome/test/base/scoped_testing_local_state.h" #include "chrome/test/base/test_browser_window.h" @@ -34,6 +33,7 @@ #include "chrome/test/base/ui_test_utils.h" #include "chrome/test/base/view_event_test_base.h" #include "components/bookmarks/browser/bookmark_model.h" +#include "components/bookmarks/common/bookmark_pref_names.h" #include "components/bookmarks/test/bookmark_test_helpers.h" #include "components/constrained_window/constrained_window_views.h" #include "content/public/browser/notification_service.h" diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_unittest.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_unittest.cc index 337bec5..7dbed29 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_unittest.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_unittest.cc @@ -13,12 +13,12 @@ #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/ui/app_list/app_list_util.h" #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view_test_helper.h" -#include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" #include "chrome/test/base/browser_with_test_window_test.h" #include "chrome/test/base/scoped_testing_local_state.h" #include "chrome/test/base/testing_browser_process.h" #include "components/bookmarks/browser/bookmark_model.h" +#include "components/bookmarks/common/bookmark_pref_names.h" #include "components/bookmarks/test/bookmark_test_helpers.h" #include "components/search_engines/search_terms_data.h" #include "components/search_engines/template_url_service.h" diff --git a/chrome/browser/ui/views/bookmarks/bookmark_context_menu_unittest.cc b/chrome/browser/ui/views/bookmarks/bookmark_context_menu_unittest.cc index f247947..1ab6051 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_context_menu_unittest.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_context_menu_unittest.cc @@ -18,9 +18,9 @@ #include "chrome/browser/bookmarks/managed_bookmark_service_factory.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/bookmarks/bookmark_utils_desktop.h" -#include "chrome/common/pref_names.h" #include "chrome/test/base/testing_profile.h" #include "components/bookmarks/browser/bookmark_model.h" +#include "components/bookmarks/common/bookmark_pref_names.h" #include "components/bookmarks/managed/managed_bookmark_service.h" #include "components/bookmarks/test/bookmark_test_helpers.h" #include "content/public/browser/page_navigator.h" diff --git a/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc b/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc index 09fdcd4..d6d8a67 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc @@ -16,8 +16,8 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h" #include "chrome/browser/ui/views/event_utils.h" -#include "chrome/common/pref_names.h" #include "components/bookmarks/browser/bookmark_model.h" +#include "components/bookmarks/common/bookmark_pref_names.h" #include "components/bookmarks/managed/managed_bookmark_service.h" #include "content/public/browser/page_navigator.h" #include "content/public/browser/user_metrics.h" diff --git a/chrome/browser/ui/views/first_run_dialog.cc b/chrome/browser/ui/views/first_run_dialog.cc index 4c723d5..10d1aa9 100644 --- a/chrome/browser/ui/views/first_run_dialog.cc +++ b/chrome/browser/ui/views/first_run_dialog.cc @@ -16,6 +16,7 @@ #include "chrome/grit/locale_settings.h" #include "chrome/installer/util/google_update_settings.h" #include "components/crash/content/app/breakpad_linux.h" +#include "components/metrics/metrics_pref_names.h" #include "grit/components_strings.h" #include "ui/aura/env.h" #include "ui/aura/window.h" diff --git a/chrome/browser/ui/views/frame/global_menu_bar_x11.cc b/chrome/browser/ui/views/frame/global_menu_bar_x11.cc index 1308715..b25516c 100644 --- a/chrome/browser/ui/views/frame/global_menu_bar_x11.cc +++ b/chrome/browser/ui/views/frame/global_menu_bar_x11.cc @@ -29,8 +29,8 @@ #include "chrome/browser/ui/views/frame/browser_desktop_window_tree_host_x11.h" #include "chrome/browser/ui/views/frame/browser_view.h" #include "chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.h" -#include "chrome/common/pref_names.h" #include "chrome/grit/generated_resources.h" +#include "components/bookmarks/common/bookmark_pref_names.h" #include "components/history/core/browser/top_sites.h" #include "components/sessions/core/tab_restore_service.h" #include "ui/base/accelerators/menu_label_accelerator_util_linux.h" diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc index 2b82fa3..958977d 100644 --- a/chrome/browser/ui/views/location_bar/location_bar_view.cc +++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc @@ -53,8 +53,8 @@ #include "chrome/browser/ui/views/passwords/manage_passwords_bubble_view.h" #include "chrome/browser/ui/views/passwords/manage_passwords_icon_views.h" #include "chrome/browser/ui/views/translate/translate_bubble_view.h" -#include "chrome/common/pref_names.h" #include "chrome/grit/generated_resources.h" +#include "components/bookmarks/common/bookmark_pref_names.h" #include "components/favicon/content/content_favicon_driver.h" #include "components/omnibox/browser/omnibox_popup_model.h" #include "components/omnibox/browser/omnibox_popup_view.h" diff --git a/chrome/browser/ui/views/profiles/profile_chooser_view_browsertest.cc b/chrome/browser/ui/views/profiles/profile_chooser_view_browsertest.cc index b3a0199..23229a4 100644 --- a/chrome/browser/ui/views/profiles/profile_chooser_view_browsertest.cc +++ b/chrome/browser/ui/views/profiles/profile_chooser_view_browsertest.cc @@ -25,6 +25,7 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "components/signin/core/common/profile_management_switches.h" +#include "components/signin/core/common/signin_pref_names.h" #include "content/public/test/test_utils.h" #include "extensions/browser/extension_registry.h" #include "ui/events/event_utils.h" diff --git a/chrome/browser/ui/views/session_crashed_bubble_view.cc b/chrome/browser/ui/views/session_crashed_bubble_view.cc index e2a9923..79f2667 100644 --- a/chrome/browser/ui/views/session_crashed_bubble_view.cc +++ b/chrome/browser/ui/views/session_crashed_bubble_view.cc @@ -31,6 +31,7 @@ #include "chrome/grit/chromium_strings.h" #include "chrome/grit/generated_resources.h" #include "chrome/installer/util/google_update_settings.h" +#include "components/metrics/metrics_pref_names.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_source.h" diff --git a/chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.cc b/chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.cc index a5e635b..d4d7bbb 100644 --- a/chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.cc +++ b/chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.cc @@ -26,6 +26,7 @@ #include "chrome/common/pref_names.h" #include "chrome/grit/generated_resources.h" #include "components/signin/core/browser/signin_manager.h" +#include "components/signin/core/common/signin_pref_names.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_ui.h" #include "net/cookies/cookie_monster.h" diff --git a/chrome/browser/ui/webui/ntp/new_tab_page_sync_handler_browsertest.cc b/chrome/browser/ui/webui/ntp/new_tab_page_sync_handler_browsertest.cc index 869e8ae..2f30668 100644 --- a/chrome/browser/ui/webui/ntp/new_tab_page_sync_handler_browsertest.cc +++ b/chrome/browser/ui/webui/ntp/new_tab_page_sync_handler_browsertest.cc @@ -12,6 +12,7 @@ #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/testing_profile.h" #include "chrome/test/base/ui_test_utils.h" +#include "components/signin/core/common/signin_pref_names.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_ui.h" #include "content/public/test/browser_test_utils.h" diff --git a/chrome/browser/ui/webui/ntp/new_tab_ui.cc b/chrome/browser/ui/webui/ntp/new_tab_ui.cc index e92c3f2d..4053d8f 100644 --- a/chrome/browser/ui/webui/ntp/new_tab_ui.cc +++ b/chrome/browser/ui/webui/ntp/new_tab_ui.cc @@ -23,9 +23,9 @@ #include "chrome/browser/ui/webui/ntp/ntp_resource_cache.h" #include "chrome/browser/ui/webui/ntp/ntp_resource_cache_factory.h" #include "chrome/browser/ui/webui/ntp/ntp_user_data_logger.h" -#include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" #include "chrome/grit/generated_resources.h" +#include "components/bookmarks/common/bookmark_pref_names.h" #include "components/pref_registry/pref_registry_syncable.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" diff --git a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc index 0fb8d9e..58352f5 100644 --- a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc +++ b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc @@ -41,6 +41,7 @@ #include "chrome/grit/chromium_strings.h" #include "chrome/grit/generated_resources.h" #include "chrome/grit/locale_settings.h" +#include "components/bookmarks/common/bookmark_pref_names.h" #include "components/google/core/browser/google_util.h" #include "components/signin/core/browser/signin_manager.h" #include "components/web_resource/notification_promo.h" diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc index 4cc2664..ab08941 100644 --- a/chrome/browser/ui/webui/options/browser_options_handler.cc +++ b/chrome/browser/ui/webui/options/browser_options_handler.cc @@ -70,6 +70,7 @@ #include "chrome/grit/chromium_strings.h" #include "chrome/grit/generated_resources.h" #include "chrome/grit/locale_settings.h" +#include "components/metrics/metrics_pref_names.h" #include "components/policy/core/common/policy_map.h" #include "components/policy/core/common/policy_namespace.h" #include "components/policy/core/common/policy_service.h" @@ -79,6 +80,7 @@ #include "components/search_engines/template_url_service.h" #include "components/signin/core/browser/signin_manager.h" #include "components/signin/core/common/profile_management_switches.h" +#include "components/signin/core/common/signin_pref_names.h" #include "components/ui/zoom/page_zoom.h" #include "components/user_manager/user_type.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/ui/webui/options/browser_options_handler.h b/chrome/browser/ui/webui/options/browser_options_handler.h index e55d23e..4acd11f 100644 --- a/chrome/browser/ui/webui/options/browser_options_handler.h +++ b/chrome/browser/ui/webui/options/browser_options_handler.h @@ -24,6 +24,7 @@ #include "components/policy/core/common/policy_service.h" #include "components/search_engines/template_url_service_observer.h" #include "components/signin/core/browser/signin_manager_base.h" +#include "components/signin/core/common/signin_pref_names.h" #include "components/sync_driver/sync_service_observer.h" #include "content/public/browser/notification_observer.h" #include "extensions/browser/extension_registry_observer.h" diff --git a/chrome/browser/ui/webui/profile_info_watcher.cc b/chrome/browser/ui/webui/profile_info_watcher.cc index 18c9b9e..48e9b62 100644 --- a/chrome/browser/ui/webui/profile_info_watcher.cc +++ b/chrome/browser/ui/webui/profile_info_watcher.cc @@ -14,6 +14,7 @@ #include "chrome/browser/signin/signin_manager_factory.h" #include "chrome/common/pref_names.h" #include "components/signin/core/browser/signin_manager.h" +#include "components/signin/core/common/signin_pref_names.h" ProfileInfoWatcher::ProfileInfoWatcher( Profile* profile, const base::Closure& callback) diff --git a/chrome/browser/ui/webui/signin/inline_login_handler.cc b/chrome/browser/ui/webui/signin/inline_login_handler.cc index 3906265..688a01a 100644 --- a/chrome/browser/ui/webui/signin/inline_login_handler.cc +++ b/chrome/browser/ui/webui/signin/inline_login_handler.cc @@ -16,6 +16,8 @@ #include "chrome/browser/ui/browser_navigator.h" #include "chrome/browser/ui/browser_navigator_params.h" #include "chrome/common/pref_names.h" +#include "components/metrics/metrics_pref_names.h" +#include "components/signin/core/common/signin_pref_names.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_ui.h" #include "google_apis/gaia/gaia_urls.h" diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h index 1eeaed3..b9bc4e8 100644 --- a/chrome/common/pref_names.h +++ b/chrome/common/pref_names.h @@ -11,14 +11,6 @@ #include "build/build_config.h" -#include "components/autofill/core/common/autofill_pref_names.h" -#include "components/bookmarks/common/bookmark_pref_names.h" -#include "components/content_settings/core/common/pref_names.h" -#include "components/data_reduction_proxy/core/common/data_reduction_proxy_pref_names.h" -#include "components/metrics/metrics_pref_names.h" -#include "components/password_manager/core/common/password_manager_pref_names.h" -#include "components/signin/core/common/signin_pref_names.h" - namespace prefs { // Profile prefs. Please add Local State prefs below instead. diff --git a/chrome/installer/util/DEPS b/chrome/installer/util/DEPS index 2f05ced..66dc0df 100644 --- a/chrome/installer/util/DEPS +++ b/chrome/installer/util/DEPS @@ -3,5 +3,5 @@ include_rules = [ # "-chrome" rule in a parent dir. "+chrome/grit/chromium_strings.h", - "+components/metrics/client_info.h", + "+components/metrics", ] diff --git a/chrome/installer/util/uninstall_metrics.cc b/chrome/installer/util/uninstall_metrics.cc index fbd1b90..11e91da 100644 --- a/chrome/installer/util/uninstall_metrics.cc +++ b/chrome/installer/util/uninstall_metrics.cc @@ -13,6 +13,7 @@ #include "base/strings/utf_string_conversions.h" #include "chrome/common/pref_names.h" #include "chrome/installer/util/util_constants.h" +#include "components/metrics/metrics_pref_names.h" namespace installer { |