diff options
Diffstat (limited to 'chrome/browser/ui/webui')
117 files changed, 136 insertions, 136 deletions
diff --git a/chrome/browser/ui/webui/app_launcher_login_handler.cc b/chrome/browser/ui/webui/app_launcher_login_handler.cc index 7d3690e..f99e987 100644 --- a/chrome/browser/ui/webui/app_launcher_login_handler.cc +++ b/chrome/browser/ui/webui/app_launcher_login_handler.cc @@ -11,7 +11,6 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/metrics/histogram.h" -#include "base/prefs/pref_service.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "build/build_config.h" @@ -34,6 +33,7 @@ #include "chrome/grit/chromium_strings.h" #include "chrome/grit/generated_resources.h" #include "components/browser_sync/browser/profile_sync_service.h" +#include "components/prefs/pref_service.h" #include "components/signin/core/browser/signin_manager.h" #include "components/web_resource/promo_resource_service.h" #include "content/public/browser/host_zoom_map.h" diff --git a/chrome/browser/ui/webui/app_list/start_page_handler.h b/chrome/browser/ui/webui/app_list/start_page_handler.h index f3a294d..516413a 100644 --- a/chrome/browser/ui/webui/app_list/start_page_handler.h +++ b/chrome/browser/ui/webui/app_list/start_page_handler.h @@ -7,7 +7,7 @@ #include "base/compiler_specific.h" #include "base/macros.h" -#include "base/prefs/pref_change_registrar.h" +#include "components/prefs/pref_change_registrar.h" #include "content/public/browser/web_ui_message_handler.h" namespace base { diff --git a/chrome/browser/ui/webui/bidi_checker_web_ui_test.cc b/chrome/browser/ui/webui/bidi_checker_web_ui_test.cc index ea05f5a..0d2949c 100644 --- a/chrome/browser/ui/webui/bidi_checker_web_ui_test.cc +++ b/chrome/browser/ui/webui/bidi_checker_web_ui_test.cc @@ -8,7 +8,6 @@ #include "base/i18n/rtl.h" #include "base/message_loop/message_loop.h" #include "base/path_service.h" -#include "base/prefs/pref_service.h" #include "base/strings/utf_string_conversions.h" #include "base/synchronization/waitable_event.h" #include "base/threading/platform_thread.h" @@ -26,6 +25,7 @@ #include "components/autofill/core/browser/autofill_test_utils.h" #include "components/autofill/core/browser/personal_data_manager.h" #include "components/history/core/browser/history_service.h" +#include "components/prefs/pref_service.h" #include "content/public/browser/browser_thread.h" #include "ui/base/resource/resource_bundle.h" diff --git a/chrome/browser/ui/webui/browsing_history_handler.cc b/chrome/browser/ui/webui/browsing_history_handler.cc index 9747f16..499099a 100644 --- a/chrome/browser/ui/webui/browsing_history_handler.cc +++ b/chrome/browser/ui/webui/browsing_history_handler.cc @@ -13,7 +13,6 @@ #include "base/i18n/rtl.h" #include "base/i18n/time_formatting.h" #include "base/metrics/histogram.h" -#include "base/prefs/pref_service.h" #include "base/strings/string16.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" @@ -39,6 +38,7 @@ #include "components/history/core/browser/history_types.h" #include "components/history/core/browser/web_history_service.h" #include "components/keyed_service/core/service_access_type.h" +#include "components/prefs/pref_service.h" #include "components/query_parser/snippet.h" #include "components/sync_driver/device_info.h" #include "components/sync_driver/device_info_tracker.h" diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc index 09f0f63..c78c48f 100644 --- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc +++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc @@ -11,7 +11,6 @@ #include "base/bind.h" #include "base/command_line.h" #include "base/location.h" -#include "base/prefs/pref_service.h" #include "base/thread_task_runner_handle.h" #include "build/build_config.h" #include "chrome/browser/about_flags.h" @@ -71,6 +70,7 @@ #include "components/favicon_base/select_favicon_frames.h" #include "components/history/core/browser/history_types.h" #include "components/password_manager/core/common/password_manager_switches.h" +#include "components/prefs/pref_service.h" #include "components/signin/core/common/profile_management_switches.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_ui.h" diff --git a/chrome/browser/ui/webui/chromeos/drive_internals_ui.cc b/chrome/browser/ui/webui/chromeos/drive_internals_ui.cc index 70c5ab5..6fdf338 100644 --- a/chrome/browser/ui/webui/chromeos/drive_internals_ui.cc +++ b/chrome/browser/ui/webui/chromeos/drive_internals_ui.cc @@ -14,7 +14,6 @@ #include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/path_service.h" -#include "base/prefs/pref_service.h" #include "base/strings/stringprintf.h" #include "base/sys_info.h" #include "chrome/browser/chromeos/drive/debug_info_collector.h" @@ -32,6 +31,7 @@ #include "components/drive/event_logger.h" #include "components/drive/job_list.h" #include "components/drive/service/drive_service_interface.h" +#include "components/prefs/pref_service.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/web_ui.h" #include "content/public/browser/web_ui_data_source.h" diff --git a/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc b/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc index d13ecf5..7da385d 100644 --- a/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc +++ b/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc @@ -13,7 +13,6 @@ #include "base/command_line.h" #include "base/macros.h" #include "base/memory/weak_ptr.h" -#include "base/prefs/pref_service.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/profiles/profile.h" @@ -22,6 +21,7 @@ #include "chrome/grit/chromium_strings.h" #include "chrome/grit/generated_resources.h" #include "chromeos/chromeos_switches.h" +#include "components/prefs/pref_service.h" #include "content/public/browser/page_navigator.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_delegate.h" diff --git a/chrome/browser/ui/webui/chromeos/login/demo_mode_detector.cc b/chrome/browser/ui/webui/chromeos/login/demo_mode_detector.cc index 6ef74c3..99b1955 100644 --- a/chrome/browser/ui/webui/chromeos/login/demo_mode_detector.cc +++ b/chrome/browser/ui/webui/chromeos/login/demo_mode_detector.cc @@ -5,14 +5,14 @@ #include "chrome/browser/ui/webui/chromeos/login/demo_mode_detector.h" #include "base/command_line.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/pref_service.h" #include "base/strings/string_number_conversions.h" #include "base/sys_info.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chromeos/login/ui/login_display_host.h" #include "chrome/common/pref_names.h" #include "chromeos/chromeos_switches.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/pref_service.h" namespace { const int kDerelectDetectionTimeoutSeconds = 8 * 60 * 60; // 8 hours. diff --git a/chrome/browser/ui/webui/chromeos/login/enable_debugging_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/enable_debugging_screen_handler.cc index 30fe681..23b78a3 100644 --- a/chrome/browser/ui/webui/chromeos/login/enable_debugging_screen_handler.cc +++ b/chrome/browser/ui/webui/chromeos/login/enable_debugging_screen_handler.cc @@ -7,8 +7,6 @@ #include <string> #include "base/command_line.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/pref_service.h" #include "base/values.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chromeos/login/ui/login_web_dialog.h" @@ -23,6 +21,8 @@ #include "chromeos/dbus/debug_daemon_client.h" #include "chromeos/dbus/power_manager_client.h" #include "components/login/localized_values_builder.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/pref_service.h" #include "grit/components_strings.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc index 2ae711f..c25df97 100644 --- a/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc +++ b/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc @@ -9,7 +9,6 @@ #include "base/guid.h" #include "base/logging.h" #include "base/metrics/histogram.h" -#include "base/prefs/pref_service.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/browser_process.h" @@ -35,6 +34,7 @@ #include "chromeos/system/devicetype.h" #include "chromeos/system/version_loader.h" #include "components/login/localized_values_builder.h" +#include "components/prefs/pref_service.h" #include "components/user_manager/known_user.h" #include "components/user_manager/user_manager.h" #include "components/version_info/version_info.h" diff --git a/chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.cc index 0d137fd..feead78 100644 --- a/chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.cc +++ b/chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.cc @@ -8,7 +8,6 @@ #include "base/command_line.h" #include "base/compiler_specific.h" #include "base/macros.h" -#include "base/prefs/pref_service.h" #include "base/strings/string16.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chromeos/login/screens/hid_detection_model.h" @@ -17,6 +16,7 @@ #include "chrome/grit/generated_resources.h" #include "chromeos/chromeos_switches.h" #include "components/login/localized_values_builder.h" +#include "components/prefs/pref_service.h" namespace { diff --git a/chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.h index 6b8d76a..c376656 100644 --- a/chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.h +++ b/chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.h @@ -8,10 +8,10 @@ #include "base/compiler_specific.h" #include "base/macros.h" #include "base/memory/scoped_ptr.h" -#include "base/prefs/pref_registry_simple.h" #include "base/values.h" #include "chrome/browser/chromeos/login/screens/hid_detection_view.h" #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h" +#include "components/prefs/pref_registry_simple.h" #include "content/public/browser/web_ui.h" namespace base { diff --git a/chrome/browser/ui/webui/chromeos/login/kiosk_autolaunch_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/kiosk_autolaunch_screen_handler.cc index 9587422..c78170a 100644 --- a/chrome/browser/ui/webui/chromeos/login/kiosk_autolaunch_screen_handler.cc +++ b/chrome/browser/ui/webui/chromeos/login/kiosk_autolaunch_screen_handler.cc @@ -7,7 +7,6 @@ #include <string> #include "base/command_line.h" -#include "base/prefs/pref_service.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_notification_types.h" @@ -18,6 +17,7 @@ #include "chromeos/dbus/dbus_thread_manager.h" #include "chromeos/dbus/session_manager_client.h" #include "components/login/localized_values_builder.h" +#include "components/prefs/pref_service.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_service.h" #include "grit/components_strings.h" diff --git a/chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc index 29d9aee..5d02864 100644 --- a/chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc +++ b/chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc @@ -9,7 +9,6 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/command_line.h" -#include "base/prefs/pref_service.h" #include "base/strings/string16.h" #include "base/strings/utf_string_conversions.h" #include "base/task_runner_util.h" @@ -34,6 +33,7 @@ #include "chromeos/network/network_handler.h" #include "chromeos/network/network_state_handler.h" #include "components/login/localized_values_builder.h" +#include "components/prefs/pref_service.h" #include "components/strings/grit/components_strings.h" #include "components/user_manager/user_manager.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/ui/webui/chromeos/login/reset_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/reset_screen_handler.cc index 1ade43a..7c5d345 100644 --- a/chrome/browser/ui/webui/chromeos/login/reset_screen_handler.cc +++ b/chrome/browser/ui/webui/chromeos/login/reset_screen_handler.cc @@ -6,7 +6,6 @@ #include <string> -#include "base/prefs/pref_registry_simple.h" #include "base/values.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chromeos/login/help_app_launcher.h" @@ -17,6 +16,7 @@ #include "chrome/grit/generated_resources.h" #include "chromeos/dbus/session_manager_client.h" #include "components/login/localized_values_builder.h" +#include "components/prefs/pref_registry_simple.h" #include "grit/components_strings.h" namespace { diff --git a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc index a815ee9..f911bf7 100644 --- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc +++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc @@ -17,9 +17,6 @@ #include "base/logging.h" #include "base/macros.h" #include "base/metrics/histogram.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/pref_service.h" -#include "base/prefs/scoped_user_pref_update.h" #include "base/strings/string16.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" @@ -71,6 +68,9 @@ #include "chromeos/network/network_state.h" #include "chromeos/network/network_state_handler.h" #include "components/login/localized_values_builder.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/pref_service.h" +#include "components/prefs/scoped_user_pref_update.h" #include "components/proximity_auth/screenlock_bridge.h" #include "components/user_manager/known_user.h" #include "components/user_manager/user.h" diff --git a/chrome/browser/ui/webui/chromeos/login/terms_of_service_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/terms_of_service_screen_handler.cc index 83d8663..f03fd06 100644 --- a/chrome/browser/ui/webui/chromeos/login/terms_of_service_screen_handler.cc +++ b/chrome/browser/ui/webui/chromeos/login/terms_of_service_screen_handler.cc @@ -9,7 +9,6 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/memory/scoped_ptr.h" -#include "base/prefs/pref_service.h" #include "base/strings/string_split.h" #include "base/values.h" #include "chrome/browser/browser_process.h" @@ -23,6 +22,7 @@ #include "chrome/grit/chromium_strings.h" #include "chrome/grit/generated_resources.h" #include "components/login/localized_values_builder.h" +#include "components/prefs/pref_service.h" #include "components/user_manager/user.h" #include "components/user_manager/user_manager.h" #include "content/public/browser/web_ui.h" diff --git a/chrome/browser/ui/webui/chromeos/slow_ui.cc b/chrome/browser/ui/webui/chromeos/slow_ui.cc index 60822e1..dbeda9a3 100644 --- a/chrome/browser/ui/webui/chromeos/slow_ui.cc +++ b/chrome/browser/ui/webui/chromeos/slow_ui.cc @@ -8,13 +8,13 @@ #include "base/bind.h" #include "base/macros.h" -#include "base/prefs/pref_change_registrar.h" -#include "base/prefs/pref_service.h" #include "base/values.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" #include "chrome/grit/generated_resources.h" +#include "components/prefs/pref_change_registrar.h" +#include "components/prefs/pref_service.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_ui.h" #include "content/public/browser/web_ui_data_source.h" diff --git a/chrome/browser/ui/webui/downloads_dom_handler.cc b/chrome/browser/ui/webui/downloads_dom_handler.cc index 36f0fbc..e04a706 100644 --- a/chrome/browser/ui/webui/downloads_dom_handler.cc +++ b/chrome/browser/ui/webui/downloads_dom_handler.cc @@ -17,7 +17,6 @@ #include "base/memory/singleton.h" #include "base/metrics/field_trial.h" #include "base/metrics/histogram.h" -#include "base/prefs/pref_service.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_piece.h" #include "base/strings/utf_string_conversions.h" @@ -43,6 +42,7 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" +#include "components/prefs/pref_service.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/download_item.h" #include "content/public/browser/url_data_source.h" diff --git a/chrome/browser/ui/webui/downloads_dom_handler_browsertest.cc b/chrome/browser/ui/webui/downloads_dom_handler_browsertest.cc index 52eadc4..adf13bc 100644 --- a/chrome/browser/ui/webui/downloads_dom_handler_browsertest.cc +++ b/chrome/browser/ui/webui/downloads_dom_handler_browsertest.cc @@ -8,7 +8,6 @@ #include "base/files/scoped_temp_dir.h" #include "base/json/json_reader.h" #include "base/macros.h" -#include "base/prefs/pref_service.h" #include "base/values.h" #include "chrome/browser/download/download_item_model.h" #include "chrome/browser/profiles/profile.h" @@ -16,6 +15,7 @@ #include "chrome/browser/ui/webui/downloads_dom_handler.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/in_process_browser_test.h" +#include "components/prefs/pref_service.h" #include "content/public/browser/web_contents.h" #include "content/public/test/mock_download_item.h" #include "content/public/test/mock_download_manager.h" diff --git a/chrome/browser/ui/webui/downloads_ui.cc b/chrome/browser/ui/webui/downloads_ui.cc index 3376d6f..37c2feb 100644 --- a/chrome/browser/ui/webui/downloads_ui.cc +++ b/chrome/browser/ui/webui/downloads_ui.cc @@ -6,7 +6,6 @@ #include "base/memory/ref_counted_memory.h" #include "base/memory/singleton.h" -#include "base/prefs/pref_service.h" #include "base/strings/string_piece.h" #include "base/threading/thread.h" #include "base/values.h" @@ -21,6 +20,7 @@ #include "chrome/common/url_constants.h" #include "chrome/grit/chromium_strings.h" #include "chrome/grit/generated_resources.h" +#include "components/prefs/pref_service.h" #include "content/public/browser/download_manager.h" #include "content/public/browser/url_data_source.h" #include "content/public/browser/web_contents.h" diff --git a/chrome/browser/ui/webui/downloads_ui_browsertest.cc b/chrome/browser/ui/webui/downloads_ui_browsertest.cc index 68c227b..0caa51d 100644 --- a/chrome/browser/ui/webui/downloads_ui_browsertest.cc +++ b/chrome/browser/ui/webui/downloads_ui_browsertest.cc @@ -5,12 +5,12 @@ #include "chrome/browser/ui/webui/downloads_ui_browsertest.h" #include "base/command_line.h" -#include "base/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/webui/downloads_util.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" +#include "components/prefs/pref_service.h" #include "content/public/test/test_utils.h" DownloadsUIBrowserTest::DownloadsUIBrowserTest() {} diff --git a/chrome/browser/ui/webui/extensions/extension_settings_handler.cc b/chrome/browser/ui/webui/extensions/extension_settings_handler.cc index 3203c31..561e8ae 100644 --- a/chrome/browser/ui/webui/extensions/extension_settings_handler.cc +++ b/chrome/browser/ui/webui/extensions/extension_settings_handler.cc @@ -6,7 +6,6 @@ #include <vector> -#include "base/prefs/pref_service.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/browser_process.h" @@ -20,6 +19,7 @@ #include "chrome/grit/generated_resources.h" #include "components/google/core/browser/google_util.h" #include "components/pref_registry/pref_registry_syncable.h" +#include "components/prefs/pref_service.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_ui.h" #include "content/public/browser/web_ui_data_source.h" diff --git a/chrome/browser/ui/webui/flags_ui.cc b/chrome/browser/ui/webui/flags_ui.cc index 11a5a24..943a77f 100644 --- a/chrome/browser/ui/webui/flags_ui.cc +++ b/chrome/browser/ui/webui/flags_ui.cc @@ -10,8 +10,6 @@ #include "base/bind_helpers.h" #include "base/macros.h" #include "base/memory/ref_counted_memory.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/pref_service.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "build/build_config.h" @@ -25,6 +23,8 @@ #include "components/flags_ui/flags_ui_constants.h" #include "components/flags_ui/flags_ui_pref_names.h" #include "components/flags_ui/pref_service_flags_storage.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/pref_service.h" #include "components/version_info/version_info.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_ui.h" diff --git a/chrome/browser/ui/webui/foreign_session_handler.cc b/chrome/browser/ui/webui/foreign_session_handler.cc index 076f89f..2f98db9 100644 --- a/chrome/browser/ui/webui/foreign_session_handler.cc +++ b/chrome/browser/ui/webui/foreign_session_handler.cc @@ -14,8 +14,6 @@ #include "base/bind_helpers.h" #include "base/i18n/time_formatting.h" #include "base/metrics/histogram_macros.h" -#include "base/prefs/pref_service.h" -#include "base/prefs/scoped_user_pref_update.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" #include "base/time/time.h" @@ -29,6 +27,8 @@ #include "chrome/common/url_constants.h" #include "components/browser_sync/browser/profile_sync_service.h" #include "components/pref_registry/pref_registry_syncable.h" +#include "components/prefs/pref_service.h" +#include "components/prefs/scoped_user_pref_update.h" #include "components/strings/grit/components_strings.h" #include "content/public/browser/url_data_source.h" #include "content/public/browser/web_contents.h" diff --git a/chrome/browser/ui/webui/help/help_handler.cc b/chrome/browser/ui/webui/help/help_handler.cc index a449b65..0db8cc3 100644 --- a/chrome/browser/ui/webui/help/help_handler.cc +++ b/chrome/browser/ui/webui/help/help_handler.cc @@ -51,7 +51,6 @@ #if defined(OS_CHROMEOS) #include "base/files/file_util_proxy.h" #include "base/i18n/time_formatting.h" -#include "base/prefs/pref_service.h" #include "base/sys_info.h" #include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h" #include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.h" @@ -66,6 +65,7 @@ #include "chromeos/dbus/dbus_thread_manager.h" #include "chromeos/dbus/power_manager_client.h" #include "chromeos/system/statistics_provider.h" +#include "components/prefs/pref_service.h" #include "components/user_manager/user_manager.h" #endif diff --git a/chrome/browser/ui/webui/history_ui.cc b/chrome/browser/ui/webui/history_ui.cc index 23b7ae50..af48f5a 100644 --- a/chrome/browser/ui/webui/history_ui.cc +++ b/chrome/browser/ui/webui/history_ui.cc @@ -6,7 +6,6 @@ #include "base/command_line.h" #include "base/memory/ref_counted_memory.h" -#include "base/prefs/pref_service.h" #include "base/strings/string16.h" #include "base/strings/utf_string_conversions.h" #include "build/build_config.h" @@ -20,6 +19,7 @@ #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" #include "chrome/grit/generated_resources.h" +#include "components/prefs/pref_service.h" #include "components/search/search.h" #include "components/signin/core/browser/signin_manager.h" #include "content/public/browser/web_ui.h" diff --git a/chrome/browser/ui/webui/inspect_ui.cc b/chrome/browser/ui/webui/inspect_ui.cc index 850b66b..fd9a75e 100644 --- a/chrome/browser/ui/webui/inspect_ui.cc +++ b/chrome/browser/ui/webui/inspect_ui.cc @@ -5,7 +5,6 @@ #include "chrome/browser/ui/webui/inspect_ui.h" #include "base/macros.h" -#include "base/prefs/pref_service.h" #include "base/stl_util.h" #include "chrome/browser/devtools/devtools_target_impl.h" #include "chrome/browser/devtools/devtools_targets_ui.h" @@ -16,6 +15,7 @@ #include "chrome/browser/ui/webui/theme_source.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" +#include "components/prefs/pref_service.h" #include "content/public/browser/devtools_agent_host.h" #include "content/public/browser/navigation_entry.h" #include "content/public/browser/notification_service.h" diff --git a/chrome/browser/ui/webui/inspect_ui.h b/chrome/browser/ui/webui/inspect_ui.h index 329e71c..be58d14 100644 --- a/chrome/browser/ui/webui/inspect_ui.h +++ b/chrome/browser/ui/webui/inspect_ui.h @@ -10,7 +10,7 @@ #include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" -#include "base/prefs/pref_change_registrar.h" +#include "components/prefs/pref_change_registrar.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/web_ui_controller.h" diff --git a/chrome/browser/ui/webui/instant_ui.cc b/chrome/browser/ui/webui/instant_ui.cc index c23ae88..0496421 100644 --- a/chrome/browser/ui/webui/instant_ui.cc +++ b/chrome/browser/ui/webui/instant_ui.cc @@ -8,7 +8,6 @@ #include "base/bind.h" #include "base/macros.h" -#include "base/prefs/pref_service.h" #include "base/strings/stringprintf.h" #include "base/time/time.h" #include "build/build_config.h" @@ -20,6 +19,7 @@ #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" #include "components/pref_registry/pref_registry_syncable.h" +#include "components/prefs/pref_service.h" #include "content/public/browser/web_ui.h" #include "content/public/browser/web_ui_data_source.h" #include "content/public/browser/web_ui_message_handler.h" diff --git a/chrome/browser/ui/webui/local_discovery/local_discovery_ui_browsertest.cc b/chrome/browser/ui/webui/local_discovery/local_discovery_ui_browsertest.cc index d097829..6289045 100644 --- a/chrome/browser/ui/webui/local_discovery/local_discovery_ui_browsertest.cc +++ b/chrome/browser/ui/webui/local_discovery/local_discovery_ui_browsertest.cc @@ -34,9 +34,9 @@ #include "net/url_request/url_request_test_util.h" #if defined(OS_CHROMEOS) -#include "base/prefs/pref_service.h" #include "chrome/common/pref_names.h" #include "chromeos/chromeos_switches.h" +#include "components/prefs/pref_service.h" #endif using testing::InvokeWithoutArgs; diff --git a/chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.cc b/chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.cc index ecade40..1cc745e 100644 --- a/chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.cc +++ b/chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.cc @@ -10,7 +10,6 @@ #include "base/bind.h" #include "base/command_line.h" #include "base/message_loop/message_loop.h" -#include "base/prefs/pref_service.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "build/build_config.h" @@ -31,6 +30,7 @@ #include "chrome/common/pref_names.h" #include "chrome/grit/generated_resources.h" #include "components/cloud_devices/common/cloud_devices_urls.h" +#include "components/prefs/pref_service.h" #include "components/signin/core/browser/profile_oauth2_token_service.h" #include "content/public/browser/user_metrics.h" #include "content/public/browser/web_ui.h" diff --git a/chrome/browser/ui/webui/local_state/local_state_ui.cc b/chrome/browser/ui/webui/local_state/local_state_ui.cc index 9b4a864..dcfb281 100644 --- a/chrome/browser/ui/webui/local_state/local_state_ui.cc +++ b/chrome/browser/ui/webui/local_state/local_state_ui.cc @@ -8,11 +8,11 @@ #include "base/json/json_string_value_serializer.h" #include "base/macros.h" -#include "base/prefs/pref_service.h" #include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/url_constants.h" +#include "components/prefs/pref_service.h" #include "content/public/browser/web_ui.h" #include "content/public/browser/web_ui_controller.h" #include "content/public/browser/web_ui_data_source.h" diff --git a/chrome/browser/ui/webui/md_downloads/md_downloads_dom_handler.cc b/chrome/browser/ui/webui/md_downloads/md_downloads_dom_handler.cc index 59698e6..6afbb28 100644 --- a/chrome/browser/ui/webui/md_downloads/md_downloads_dom_handler.cc +++ b/chrome/browser/ui/webui/md_downloads/md_downloads_dom_handler.cc @@ -12,7 +12,6 @@ #include "base/i18n/rtl.h" #include "base/logging.h" #include "base/metrics/histogram.h" -#include "base/prefs/pref_service.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_piece.h" #include "base/strings/utf_string_conversions.h" @@ -34,6 +33,7 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" +#include "components/prefs/pref_service.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/download_item.h" #include "content/public/browser/download_manager.h" diff --git a/chrome/browser/ui/webui/md_downloads/md_downloads_ui.cc b/chrome/browser/ui/webui/md_downloads/md_downloads_ui.cc index 733f9c5..7880664 100644 --- a/chrome/browser/ui/webui/md_downloads/md_downloads_ui.cc +++ b/chrome/browser/ui/webui/md_downloads/md_downloads_ui.cc @@ -6,7 +6,6 @@ #include "base/memory/ref_counted_memory.h" #include "base/memory/singleton.h" -#include "base/prefs/pref_service.h" #include "base/strings/string_piece.h" #include "base/threading/thread.h" #include "base/values.h" @@ -22,6 +21,7 @@ #include "chrome/common/url_constants.h" #include "chrome/grit/chromium_strings.h" #include "chrome/grit/generated_resources.h" +#include "components/prefs/pref_service.h" #include "content/public/browser/download_manager.h" #include "content/public/browser/url_data_source.h" #include "content/public/browser/web_contents.h" diff --git a/chrome/browser/ui/webui/media/webrtc_logs_ui.cc b/chrome/browser/ui/webui/media/webrtc_logs_ui.cc index a58dbdd..a893dc1 100644 --- a/chrome/browser/ui/webui/media/webrtc_logs_ui.cc +++ b/chrome/browser/ui/webui/media/webrtc_logs_ui.cc @@ -12,7 +12,6 @@ #include "base/i18n/time_formatting.h" #include "base/macros.h" #include "base/memory/ref_counted_memory.h" -#include "base/prefs/pref_service.h" #include "base/strings/string16.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" @@ -23,6 +22,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/common/url_constants.h" #include "chrome/grit/generated_resources.h" +#include "components/prefs/pref_service.h" #include "components/upload_list/upload_list.h" #include "components/version_info/version_info.h" #include "content/public/browser/web_contents.h" diff --git a/chrome/browser/ui/webui/media_router/media_router_webui_message_handler.cc b/chrome/browser/ui/webui/media_router/media_router_webui_message_handler.cc index 934776c..5416645 100644 --- a/chrome/browser/ui/webui/media_router/media_router_webui_message_handler.cc +++ b/chrome/browser/ui/webui/media_router/media_router_webui_message_handler.cc @@ -10,7 +10,6 @@ #include "base/metrics/histogram_macros.h" #include "base/metrics/sparse_histogram.h" #include "base/metrics/user_metrics.h" -#include "base/prefs/pref_service.h" #include "base/strings/stringprintf.h" #include "base/values.h" #include "chrome/browser/media/router/issue.h" @@ -19,6 +18,7 @@ #include "chrome/browser/ui/webui/media_router/media_router_ui.h" #include "chrome/common/pref_names.h" #include "chrome/grit/generated_resources.h" +#include "components/prefs/pref_service.h" #include "extensions/common/constants.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/webui/net_internals/net_internals_ui.cc b/chrome/browser/ui/webui/net_internals/net_internals_ui.cc index 9e161f7..b0000c2 100644 --- a/chrome/browser/ui/webui/net_internals/net_internals_ui.cc +++ b/chrome/browser/ui/webui/net_internals/net_internals_ui.cc @@ -22,7 +22,6 @@ #include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/message_loop/message_loop.h" -#include "base/prefs/pref_member.h" #include "base/sequenced_task_runner_helpers.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_piece.h" @@ -53,6 +52,7 @@ #include "components/data_reduction_proxy/core/common/data_reduction_proxy_event_store.h" #include "components/net_log/chrome_net_log.h" #include "components/onc/onc_constants.h" +#include "components/prefs/pref_member.h" #include "components/url_formatter/url_fixer.h" #include "components/version_info/version_info.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc b/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc index 4d21da6..97590ec 100644 --- a/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc +++ b/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc @@ -13,7 +13,6 @@ #include "base/files/file_util.h" #include "base/files/scoped_file.h" #include "base/macros.h" -#include "base/prefs/pref_service.h" #include "base/strings/string_split.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" @@ -31,6 +30,7 @@ #include "chrome/common/pref_names.h" #include "chrome/test/base/ui_test_utils.h" #include "components/net_log/chrome_net_log.h" +#include "components/prefs/pref_service.h" #include "content/public/browser/render_frame_host.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_ui_message_handler.h" diff --git a/chrome/browser/ui/webui/ntp/app_launcher_handler.cc b/chrome/browser/ui/webui/ntp/app_launcher_handler.cc index 44be513..29d62a7 100644 --- a/chrome/browser/ui/webui/ntp/app_launcher_handler.cc +++ b/chrome/browser/ui/webui/ntp/app_launcher_handler.cc @@ -16,8 +16,6 @@ #include "base/i18n/rtl.h" #include "base/metrics/field_trial.h" #include "base/metrics/histogram.h" -#include "base/prefs/pref_service.h" -#include "base/prefs/scoped_user_pref_update.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/browser_process.h" @@ -50,6 +48,8 @@ #include "chrome/common/web_application_info.h" #include "chrome/grit/generated_resources.h" #include "components/favicon_base/favicon_types.h" +#include "components/prefs/pref_service.h" +#include "components/prefs/scoped_user_pref_update.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/web_ui.h" #include "content/public/common/favicon_url.h" diff --git a/chrome/browser/ui/webui/ntp/app_launcher_handler.h b/chrome/browser/ui/webui/ntp/app_launcher_handler.h index 3ab612c..d95e43d 100644 --- a/chrome/browser/ui/webui/ntp/app_launcher_handler.h +++ b/chrome/browser/ui/webui/ntp/app_launcher_handler.h @@ -11,12 +11,12 @@ #include "apps/metrics_names.h" #include "base/macros.h" #include "base/memory/scoped_ptr.h" -#include "base/prefs/pref_change_registrar.h" #include "base/task/cancelable_task_tracker.h" #include "chrome/browser/extensions/extension_uninstall_dialog.h" #include "chrome/browser/ui/extensions/extension_enable_flow_delegate.h" #include "chrome/common/extensions/extension_constants.h" #include "components/favicon/core/favicon_service.h" +#include "components/prefs/pref_change_registrar.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/web_ui_message_handler.h" diff --git a/chrome/browser/ui/webui/ntp/new_tab_page_handler.cc b/chrome/browser/ui/webui/ntp/new_tab_page_handler.cc index 059af69..f756691 100644 --- a/chrome/browser/ui/webui/ntp/new_tab_page_handler.cc +++ b/chrome/browser/ui/webui/ntp/new_tab_page_handler.cc @@ -8,7 +8,6 @@ #include "base/bind_helpers.h" #include "base/memory/scoped_ptr.h" #include "base/metrics/histogram.h" -#include "base/prefs/pref_service.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" @@ -16,6 +15,7 @@ #include "chrome/common/pref_names.h" #include "components/browser_sync/browser/profile_sync_service.h" #include "components/pref_registry/pref_registry_syncable.h" +#include "components/prefs/pref_service.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/web_ui.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 e0bca8b..7c80144 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 @@ -8,7 +8,6 @@ #include "base/bind.h" #include "base/bind_helpers.h" -#include "base/prefs/pref_service.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" @@ -25,6 +24,7 @@ #include "chrome/common/pref_names.h" #include "chrome/grit/generated_resources.h" #include "components/browser_sync/browser/profile_sync_service.h" +#include "components/prefs/pref_service.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" diff --git a/chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.h b/chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.h index 7b04403..fd2af9a 100644 --- a/chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.h +++ b/chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.h @@ -9,9 +9,9 @@ #include "base/gtest_prod_util.h" #include "base/macros.h" -#include "base/prefs/pref_change_registrar.h" #include "chrome/browser/sync/sync_ui_util.h" #include "components/browser_sync/browser/profile_sync_service.h" +#include "components/prefs/pref_change_registrar.h" #include "content/public/browser/web_ui_message_handler.h" namespace base { 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 2f30668..3f63899 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 @@ -4,7 +4,6 @@ #include "chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.h" -#include "base/prefs/pref_service.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/common/pref_names.h" @@ -12,6 +11,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/prefs/pref_service.h" #include "components/signin/core/common/signin_pref_names.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_ui.h" diff --git a/chrome/browser/ui/webui/ntp/new_tab_ui.cc b/chrome/browser/ui/webui/ntp/new_tab_ui.cc index 7611409..a07ae5a 100644 --- a/chrome/browser/ui/webui/ntp/new_tab_ui.cc +++ b/chrome/browser/ui/webui/ntp/new_tab_ui.cc @@ -10,7 +10,6 @@ #include "base/lazy_instance.h" #include "base/memory/scoped_ptr.h" #include "base/metrics/histogram.h" -#include "base/prefs/pref_service.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/profiles/profile.h" @@ -27,6 +26,7 @@ #include "chrome/grit/generated_resources.h" #include "components/bookmarks/common/bookmark_pref_names.h" #include "components/pref_registry/pref_registry_syncable.h" +#include "components/prefs/pref_service.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/render_process_host.h" diff --git a/chrome/browser/ui/webui/ntp/new_tab_ui.h b/chrome/browser/ui/webui/ntp/new_tab_ui.h index 97886fe..d0b8dfc 100644 --- a/chrome/browser/ui/webui/ntp/new_tab_ui.h +++ b/chrome/browser/ui/webui/ntp/new_tab_ui.h @@ -8,9 +8,9 @@ #include <string> #include "base/macros.h" -#include "base/prefs/pref_change_registrar.h" #include "base/time/time.h" #include "base/timer/timer.h" +#include "components/prefs/pref_change_registrar.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/url_data_source.h" diff --git a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc index e74b0fc..5c3f4f99 100644 --- a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc +++ b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc @@ -9,7 +9,6 @@ #include "base/command_line.h" #include "base/memory/ref_counted_memory.h" -#include "base/prefs/pref_service.h" #include "base/strings/string16.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" @@ -44,6 +43,7 @@ #include "components/bookmarks/common/bookmark_pref_names.h" #include "components/browser_sync/browser/profile_sync_service.h" #include "components/google/core/browser/google_util.h" +#include "components/prefs/pref_service.h" #include "components/signin/core/browser/signin_manager.h" #include "components/web_resource/notification_promo.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/ui/webui/ntp/ntp_resource_cache.h b/chrome/browser/ui/webui/ntp/ntp_resource_cache.h index df898d6..0c314b7 100644 --- a/chrome/browser/ui/webui/ntp/ntp_resource_cache.h +++ b/chrome/browser/ui/webui/ntp/ntp_resource_cache.h @@ -8,9 +8,9 @@ #include "base/compiler_specific.h" #include "base/macros.h" #include "base/memory/ref_counted.h" -#include "base/prefs/pref_change_registrar.h" #include "base/strings/string16.h" #include "components/keyed_service/core/keyed_service.h" +#include "components/prefs/pref_change_registrar.h" #include "components/web_resource/promo_resource_service.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc index d93c256..7143a3e 100644 --- a/chrome/browser/ui/webui/options/browser_options_handler.cc +++ b/chrome/browser/ui/webui/options/browser_options_handler.cc @@ -18,8 +18,6 @@ #include "base/memory/singleton.h" #include "base/metrics/field_trial.h" #include "base/metrics/histogram.h" -#include "base/prefs/pref_service.h" -#include "base/prefs/scoped_user_pref_update.h" #include "base/stl_util.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" @@ -77,6 +75,8 @@ #include "components/policy/core/common/policy_map.h" #include "components/policy/core/common/policy_namespace.h" #include "components/policy/core/common/policy_service.h" +#include "components/prefs/pref_service.h" +#include "components/prefs/scoped_user_pref_update.h" #include "components/proximity_auth/switches.h" #include "components/proxy_config/proxy_config_pref_names.h" #include "components/search_engines/template_url.h" diff --git a/chrome/browser/ui/webui/options/browser_options_handler.h b/chrome/browser/ui/webui/options/browser_options_handler.h index 31bc320..7da9ff2 100644 --- a/chrome/browser/ui/webui/options/browser_options_handler.h +++ b/chrome/browser/ui/webui/options/browser_options_handler.h @@ -12,8 +12,6 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" -#include "base/prefs/pref_change_registrar.h" -#include "base/prefs/pref_member.h" #include "base/scoped_observer.h" #include "build/build_config.h" #include "chrome/browser/profiles/profile.h" @@ -23,6 +21,8 @@ #include "chrome/browser/ui/webui/options/options_ui.h" #include "chrome/browser/ui/zoom/chrome_zoom_level_prefs.h" #include "components/policy/core/common/policy_service.h" +#include "components/prefs/pref_change_registrar.h" +#include "components/prefs/pref_member.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" diff --git a/chrome/browser/ui/webui/options/chromeos/accounts_options_browsertest.cc b/chrome/browser/ui/webui/options/chromeos/accounts_options_browsertest.cc index 446ff3d..97d32b8 100644 --- a/chrome/browser/ui/webui/options/chromeos/accounts_options_browsertest.cc +++ b/chrome/browser/ui/webui/options/chromeos/accounts_options_browsertest.cc @@ -7,7 +7,6 @@ #include "base/command_line.h" #include "base/compiler_specific.h" #include "base/macros.h" -#include "base/prefs/pref_service.h" #include "chrome/browser/chromeos/login/login_manager_test.h" #include "chrome/browser/chromeos/login/startup_utils.h" #include "chrome/browser/chromeos/login/ui/user_adding_screen.h" @@ -20,6 +19,7 @@ #include "chrome/common/pref_names.h" #include "chrome/test/base/ui_test_utils.h" #include "chromeos/settings/cros_settings_names.h" +#include "components/prefs/pref_service.h" #include "components/user_manager/user_manager.h" #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" diff --git a/chrome/browser/ui/webui/options/chromeos/accounts_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/accounts_options_handler.cc index 140c31d..103b4c4 100644 --- a/chrome/browser/ui/webui/options/chromeos/accounts_options_handler.cc +++ b/chrome/browser/ui/webui/options/chromeos/accounts_options_handler.cc @@ -12,7 +12,6 @@ #include "base/bind_helpers.h" #include "base/json/json_reader.h" #include "base/memory/scoped_ptr.h" -#include "base/prefs/pref_service.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/browser_process.h" @@ -25,6 +24,7 @@ #include "chrome/grit/generated_resources.h" #include "chromeos/login/user_names.h" #include "chromeos/settings/cros_settings_names.h" +#include "components/prefs/pref_service.h" #include "components/user_manager/user_manager.h" #include "content/public/browser/web_ui.h" #include "google_apis/gaia/gaia_auth_util.h" diff --git a/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc index 2e1016b..d98d88b 100644 --- a/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc +++ b/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc @@ -12,7 +12,6 @@ #include "ash/shell.h" #include "base/bind.h" #include "base/macros.h" -#include "base/prefs/pref_change_registrar.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" @@ -30,6 +29,7 @@ #include "chrome/browser/ui/webui/options/chromeos/accounts_options_handler.h" #include "chrome/common/pref_names.h" #include "chrome/grit/generated_resources.h" +#include "components/prefs/pref_change_registrar.h" #include "components/proxy_config/proxy_config_pref_names.h" #include "components/user_manager/user_manager.h" #include "content/public/browser/notification_service.h" diff --git a/chrome/browser/ui/webui/options/chromeos/keyboard_handler.h b/chrome/browser/ui/webui/options/chromeos/keyboard_handler.h index 2ae8c5f..8f6501a 100644 --- a/chrome/browser/ui/webui/options/chromeos/keyboard_handler.h +++ b/chrome/browser/ui/webui/options/chromeos/keyboard_handler.h @@ -7,8 +7,8 @@ #include "base/compiler_specific.h" #include "base/macros.h" -#include "base/prefs/pref_member.h" #include "chrome/browser/ui/webui/options/options_ui.h" +#include "components/prefs/pref_member.h" #include "ui/events/devices/input_device_event_observer.h" namespace chromeos { diff --git a/chrome/browser/ui/webui/options/chromeos/pointer_handler.h b/chrome/browser/ui/webui/options/chromeos/pointer_handler.h index 0dc6e93..d0d4c48 100644 --- a/chrome/browser/ui/webui/options/chromeos/pointer_handler.h +++ b/chrome/browser/ui/webui/options/chromeos/pointer_handler.h @@ -8,9 +8,9 @@ #include "base/compiler_specific.h" #include "base/macros.h" #include "base/memory/weak_ptr.h" -#include "base/prefs/pref_member.h" #include "chrome/browser/chromeos/system/pointer_device_observer.h" #include "chrome/browser/ui/webui/options/options_ui.h" +#include "components/prefs/pref_member.h" namespace chromeos { namespace options { diff --git a/chrome/browser/ui/webui/options/chromeos/shared_options_browsertest.cc b/chrome/browser/ui/webui/options/chromeos/shared_options_browsertest.cc index af5da3e..c586fc5 100644 --- a/chrome/browser/ui/webui/options/chromeos/shared_options_browsertest.cc +++ b/chrome/browser/ui/webui/options/chromeos/shared_options_browsertest.cc @@ -6,7 +6,6 @@ #include "base/compiler_specific.h" #include "base/macros.h" -#include "base/prefs/pref_service.h" #include "base/strings/stringprintf.h" #include "chrome/browser/chromeos/login/login_manager_test.h" #include "chrome/browser/chromeos/login/startup_utils.h" @@ -21,6 +20,7 @@ #include "chrome/common/pref_names.h" #include "chrome/test/base/ui_test_utils.h" #include "chromeos/settings/cros_settings_names.h" +#include "components/prefs/pref_service.h" #include "components/signin/core/browser/signin_manager.h" #include "components/user_manager/user_manager.h" #include "content/public/browser/web_contents.h" diff --git a/chrome/browser/ui/webui/options/clear_browser_data_browsertest.cc b/chrome/browser/ui/webui/options/clear_browser_data_browsertest.cc index 9e0973b..bc70984 100644 --- a/chrome/browser/ui/webui/options/clear_browser_data_browsertest.cc +++ b/chrome/browser/ui/webui/options/clear_browser_data_browsertest.cc @@ -5,13 +5,13 @@ #include <stddef.h> #include "base/macros.h" -#include "base/prefs/pref_service.h" #include "build/build_config.h" #include "chrome/browser/browsing_data/browsing_data_remover_test_util.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/webui/options/options_ui_browsertest.h" #include "chrome/common/url_constants.h" +#include "components/prefs/pref_service.h" #include "content/public/test/browser_test_utils.h" namespace options { diff --git a/chrome/browser/ui/webui/options/clear_browser_data_handler.cc b/chrome/browser/ui/webui/options/clear_browser_data_handler.cc index 4f2aaf3..892ad95 100644 --- a/chrome/browser/ui/webui/options/clear_browser_data_handler.cc +++ b/chrome/browser/ui/webui/options/clear_browser_data_handler.cc @@ -12,7 +12,6 @@ #include "base/macros.h" #include "base/metrics/histogram_macros.h" #include "base/metrics/sparse_histogram.h" -#include "base/prefs/pref_service.h" #include "base/strings/string16.h" #include "base/strings/string_number_conversions.h" #include "base/values.h" @@ -35,6 +34,7 @@ #include "chrome/grit/generated_resources.h" #include "chrome/grit/locale_settings.h" #include "components/google/core/browser/google_util.h" +#include "components/prefs/pref_service.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/web_ui.h" #include "ui/base/accelerators/accelerator.h" diff --git a/chrome/browser/ui/webui/options/clear_browser_data_handler.h b/chrome/browser/ui/webui/options/clear_browser_data_handler.h index 30c15e4..44786bc 100644 --- a/chrome/browser/ui/webui/options/clear_browser_data_handler.h +++ b/chrome/browser/ui/webui/options/clear_browser_data_handler.h @@ -7,11 +7,11 @@ #include "base/macros.h" #include "base/memory/scoped_vector.h" -#include "base/prefs/pref_member.h" #include "chrome/browser/browsing_data/browsing_data_counter.h" #include "chrome/browser/browsing_data/browsing_data_remover.h" #include "chrome/browser/ui/webui/options/options_ui.h" #include "components/browser_sync/browser/profile_sync_service.h" +#include "components/prefs/pref_member.h" namespace options { diff --git a/chrome/browser/ui/webui/options/content_settings_handler.cc b/chrome/browser/ui/webui/options/content_settings_handler.cc index cff82e5..4d1e47e 100644 --- a/chrome/browser/ui/webui/options/content_settings_handler.cc +++ b/chrome/browser/ui/webui/options/content_settings_handler.cc @@ -15,7 +15,6 @@ #include "base/command_line.h" #include "base/logging.h" #include "base/macros.h" -#include "base/prefs/pref_service.h" #include "base/stl_util.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" @@ -51,6 +50,7 @@ #include "components/content_settings/core/common/content_settings.h" #include "components/content_settings/core/common/content_settings_pattern.h" #include "components/google/core/browser/google_util.h" +#include "components/prefs/pref_service.h" #include "components/signin/core/common/profile_management_switches.h" #include "components/user_prefs/user_prefs.h" #include "content/public/browser/notification_service.h" diff --git a/chrome/browser/ui/webui/options/content_settings_handler.h b/chrome/browser/ui/webui/options/content_settings_handler.h index 8ac7cad..fa792e7 100644 --- a/chrome/browser/ui/webui/options/content_settings_handler.h +++ b/chrome/browser/ui/webui/options/content_settings_handler.h @@ -11,7 +11,6 @@ #include "base/macros.h" #include "base/memory/scoped_ptr.h" -#include "base/prefs/pref_change_registrar.h" #include "base/scoped_observer.h" #include "base/values.h" #include "chrome/browser/pepper_flash_settings_manager.h" @@ -20,6 +19,7 @@ #include "components/content_settings/core/browser/content_settings_observer.h" #include "components/content_settings/core/common/content_settings.h" #include "components/content_settings/core/common/content_settings_types.h" +#include "components/prefs/pref_change_registrar.h" #include "content/public/browser/host_zoom_map.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" diff --git a/chrome/browser/ui/webui/options/core_options_handler.h b/chrome/browser/ui/webui/options/core_options_handler.h index 5b49bfa..f2bb925 100644 --- a/chrome/browser/ui/webui/options/core_options_handler.h +++ b/chrome/browser/ui/webui/options/core_options_handler.h @@ -10,11 +10,11 @@ #include "base/callback.h" #include "base/macros.h" -#include "base/prefs/pref_change_registrar.h" -#include "base/prefs/pref_service.h" #include "base/values.h" #include "chrome/browser/plugins/plugin_status_pref_setter.h" #include "chrome/browser/ui/webui/options/options_ui.h" +#include "components/prefs/pref_change_registrar.h" +#include "components/prefs/pref_service.h" namespace options { diff --git a/chrome/browser/ui/webui/options/create_profile_handler.cc b/chrome/browser/ui/webui/options/create_profile_handler.cc index a85a4f4..b86fbfa 100644 --- a/chrome/browser/ui/webui/options/create_profile_handler.cc +++ b/chrome/browser/ui/webui/options/create_profile_handler.cc @@ -9,7 +9,6 @@ #include "base/bind.h" #include "base/files/file_path.h" #include "base/metrics/histogram.h" -#include "base/prefs/pref_service.h" #include "base/strings/string_util.h" #include "base/value_conversions.h" #include "base/values.h" @@ -23,6 +22,7 @@ #include "chrome/common/pref_names.h" #include "chrome/grit/generated_resources.h" #include "components/browser_sync/browser/profile_sync_service.h" +#include "components/prefs/pref_service.h" #include "content/public/browser/web_ui.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/webui/options/font_settings_handler.cc b/chrome/browser/ui/webui/options/font_settings_handler.cc index d6d86a2..002dbdd 100644 --- a/chrome/browser/ui/webui/options/font_settings_handler.cc +++ b/chrome/browser/ui/webui/options/font_settings_handler.cc @@ -12,7 +12,6 @@ #include "base/bind_helpers.h" #include "base/i18n/rtl.h" #include "base/macros.h" -#include "base/prefs/pref_service.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" @@ -27,6 +26,7 @@ #include "chrome/browser/ui/webui/options/font_settings_utils.h" #include "chrome/common/pref_names.h" #include "chrome/grit/generated_resources.h" +#include "components/prefs/pref_service.h" #include "content/public/browser/font_list_async.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_service.h" diff --git a/chrome/browser/ui/webui/options/font_settings_handler.h b/chrome/browser/ui/webui/options/font_settings_handler.h index 171d731..927c39b 100644 --- a/chrome/browser/ui/webui/options/font_settings_handler.h +++ b/chrome/browser/ui/webui/options/font_settings_handler.h @@ -8,9 +8,9 @@ #include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" -#include "base/prefs/pref_member.h" #include "base/scoped_observer.h" #include "chrome/browser/ui/webui/options/options_ui.h" +#include "components/prefs/pref_member.h" #include "extensions/browser/extension_registry_observer.h" namespace base { diff --git a/chrome/browser/ui/webui/options/font_settings_utils_mac.mm b/chrome/browser/ui/webui/options/font_settings_utils_mac.mm index 6dae847..85c220f 100644 --- a/chrome/browser/ui/webui/options/font_settings_utils_mac.mm +++ b/chrome/browser/ui/webui/options/font_settings_utils_mac.mm @@ -7,10 +7,10 @@ #import <Cocoa/Cocoa.h> #include "base/mac/scoped_nsautorelease_pool.h" -#include "base/prefs/pref_service.h" #include "base/strings/sys_string_conversions.h" #include "base/values.h" #include "chrome/common/pref_names.h" +#include "components/prefs/pref_service.h" namespace options { diff --git a/chrome/browser/ui/webui/options/geolocation_options_handler.h b/chrome/browser/ui/webui/options/geolocation_options_handler.h index f3ce970..aeb4e76 100644 --- a/chrome/browser/ui/webui/options/geolocation_options_handler.h +++ b/chrome/browser/ui/webui/options/geolocation_options_handler.h @@ -6,8 +6,8 @@ #define CHROME_BROWSER_UI_WEBUI_OPTIONS_GEOLOCATION_OPTIONS_HANDLER_H_ #include "base/macros.h" -#include "base/prefs/pref_member.h" #include "chrome/browser/ui/webui/options/options_ui.h" +#include "components/prefs/pref_member.h" namespace options { diff --git a/chrome/browser/ui/webui/options/handler_options_handler.cc b/chrome/browser/ui/webui/options/handler_options_handler.cc index 7958f35..07df72c 100644 --- a/chrome/browser/ui/webui/options/handler_options_handler.cc +++ b/chrome/browser/ui/webui/options/handler_options_handler.cc @@ -9,7 +9,6 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/macros.h" -#include "base/prefs/pref_service.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/chrome_notification_types.h" @@ -18,6 +17,7 @@ #include "chrome/common/url_constants.h" #include "chrome/grit/generated_resources.h" #include "components/google/core/browser/google_util.h" +#include "components/prefs/pref_service.h" #include "content/public/browser/web_ui.h" namespace options { diff --git a/chrome/browser/ui/webui/options/language_options_handler.cc b/chrome/browser/ui/webui/options/language_options_handler.cc index 0b45d66..1d25816 100644 --- a/chrome/browser/ui/webui/options/language_options_handler.cc +++ b/chrome/browser/ui/webui/options/language_options_handler.cc @@ -14,7 +14,6 @@ #include "base/bind.h" #include "base/command_line.h" #include "base/i18n/rtl.h" -#include "base/prefs/pref_service.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/browser_process.h" @@ -22,6 +21,7 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "chrome/grit/generated_resources.h" +#include "components/prefs/pref_service.h" #include "content/public/browser/user_metrics.h" #include "content/public/browser/web_ui.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/webui/options/language_options_handler_common.cc b/chrome/browser/ui/webui/options/language_options_handler_common.cc index 65fe804..dfd89a1 100644 --- a/chrome/browser/ui/webui/options/language_options_handler_common.cc +++ b/chrome/browser/ui/webui/options/language_options_handler_common.cc @@ -15,7 +15,6 @@ #include "base/command_line.h" #include "base/macros.h" #include "base/memory/scoped_vector.h" -#include "base/prefs/pref_service.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" @@ -33,6 +32,7 @@ #include "chrome/common/spellcheck_common.h" #include "chrome/grit/chromium_strings.h" #include "chrome/grit/generated_resources.h" +#include "components/prefs/pref_service.h" #include "components/translate/core/browser/translate_download_manager.h" #include "components/translate/core/browser/translate_prefs.h" #include "content/public/browser/user_metrics.h" diff --git a/chrome/browser/ui/webui/options/language_options_interactive_uitest.cc b/chrome/browser/ui/webui/options/language_options_interactive_uitest.cc index 051fe12..a98de0a 100644 --- a/chrome/browser/ui/webui/options/language_options_interactive_uitest.cc +++ b/chrome/browser/ui/webui/options/language_options_interactive_uitest.cc @@ -3,7 +3,6 @@ // found in the LICENSE file. #include "base/macros.h" -#include "base/prefs/pref_service.h" #include "build/build_config.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/ui/browser_window.h" @@ -14,6 +13,7 @@ #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/interactive_test_utils.h" #include "chrome/test/base/ui_test_utils.h" +#include "components/prefs/pref_service.h" #include "content/public/browser/render_frame_host.h" #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" diff --git a/chrome/browser/ui/webui/options/manage_profile_handler.cc b/chrome/browser/ui/webui/options/manage_profile_handler.cc index 6e4464a..30b15e2 100644 --- a/chrome/browser/ui/webui/options/manage_profile_handler.cc +++ b/chrome/browser/ui/webui/options/manage_profile_handler.cc @@ -9,8 +9,6 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/macros.h" -#include "base/prefs/pref_service.h" -#include "base/prefs/scoped_user_pref_update.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" @@ -37,6 +35,8 @@ #include "chrome/grit/chromium_strings.h" #include "chrome/grit/generated_resources.h" #include "components/browser_sync/browser/profile_sync_service.h" +#include "components/prefs/pref_service.h" +#include "components/prefs/scoped_user_pref_update.h" #include "components/signin/core/browser/signin_manager.h" #include "components/signin/core/common/profile_management_switches.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/ui/webui/options/manage_profile_handler.h b/chrome/browser/ui/webui/options/manage_profile_handler.h index 49d99a8..698368d 100644 --- a/chrome/browser/ui/webui/options/manage_profile_handler.h +++ b/chrome/browser/ui/webui/options/manage_profile_handler.h @@ -9,9 +9,9 @@ #include "base/macros.h" #include "base/memory/weak_ptr.h" -#include "base/prefs/pref_change_registrar.h" #include "chrome/browser/profiles/profile_info_cache_observer.h" #include "chrome/browser/ui/webui/options/options_ui.h" +#include "components/prefs/pref_change_registrar.h" #include "components/sync_driver/sync_service_observer.h" namespace base { diff --git a/chrome/browser/ui/webui/options/media_devices_selection_handler.cc b/chrome/browser/ui/webui/options/media_devices_selection_handler.cc index f574933..2923325 100644 --- a/chrome/browser/ui/webui/options/media_devices_selection_handler.cc +++ b/chrome/browser/ui/webui/options/media_devices_selection_handler.cc @@ -8,10 +8,10 @@ #include "base/bind.h" #include "base/macros.h" -#include "base/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/pref_names.h" #include "chrome/grit/generated_resources.h" +#include "components/prefs/pref_service.h" namespace { diff --git a/chrome/browser/ui/webui/options/multilanguage_options_browsertest.cc b/chrome/browser/ui/webui/options/multilanguage_options_browsertest.cc index e1a589e..069ae0e 100644 --- a/chrome/browser/ui/webui/options/multilanguage_options_browsertest.cc +++ b/chrome/browser/ui/webui/options/multilanguage_options_browsertest.cc @@ -7,11 +7,11 @@ #include <string> #include "base/command_line.h" -#include "base/prefs/pref_service.h" #include "build/build_config.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" +#include "components/prefs/pref_service.h" MultilanguageOptionsBrowserTest::MultilanguageOptionsBrowserTest() { } diff --git a/chrome/browser/ui/webui/options/options_browsertest.cc b/chrome/browser/ui/webui/options/options_browsertest.cc index e136d92..d964c35 100644 --- a/chrome/browser/ui/webui/options/options_browsertest.cc +++ b/chrome/browser/ui/webui/options/options_browsertest.cc @@ -5,11 +5,11 @@ #include "chrome/browser/ui/webui/options/options_browsertest.h" #include "base/bind.h" -#include "base/prefs/pref_service.h" #include "base/values.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" +#include "components/prefs/pref_service.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/navigation_entry.h" #include "content/public/browser/web_contents.h" diff --git a/chrome/browser/ui/webui/options/options_ui_browsertest.cc b/chrome/browser/ui/webui/options/options_ui_browsertest.cc index b42883e..e5d7a97 100644 --- a/chrome/browser/ui/webui/options/options_ui_browsertest.cc +++ b/chrome/browser/ui/webui/options/options_ui_browsertest.cc @@ -4,7 +4,6 @@ #include "chrome/browser/ui/webui/options/options_ui_browsertest.h" -#include "base/prefs/pref_service.h" #include "base/scoped_observer.h" #include "base/strings/string16.h" #include "base/strings/utf_string_conversions.h" @@ -20,6 +19,7 @@ #include "chrome/common/url_constants.h" #include "chrome/grit/generated_resources.h" #include "chrome/test/base/ui_test_utils.h" +#include "components/prefs/pref_service.h" #include "components/signin/core/browser/account_tracker_service.h" #include "components/signin/core/browser/signin_manager.h" #include "components/strings/grit/components_strings.h" diff --git a/chrome/browser/ui/webui/options/password_manager_handler.cc b/chrome/browser/ui/webui/options/password_manager_handler.cc index 645eacf..436380b 100644 --- a/chrome/browser/ui/webui/options/password_manager_handler.cc +++ b/chrome/browser/ui/webui/options/password_manager_handler.cc @@ -7,7 +7,6 @@ #include "base/bind.h" #include "base/command_line.h" #include "base/macros.h" -#include "base/prefs/pref_service.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" #include "base/strings/utf_string_conversions.h" @@ -25,6 +24,7 @@ #include "components/password_manager/core/browser/password_manager_constants.h" #include "components/password_manager/core/browser/password_ui_utils.h" #include "components/password_manager/core/common/experiments.h" +#include "components/prefs/pref_service.h" #include "components/url_formatter/url_formatter.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" diff --git a/chrome/browser/ui/webui/options/password_manager_handler.h b/chrome/browser/ui/webui/options/password_manager_handler.h index fc09064..d8ed6c0 100644 --- a/chrome/browser/ui/webui/options/password_manager_handler.h +++ b/chrome/browser/ui/webui/options/password_manager_handler.h @@ -11,11 +11,11 @@ #include <vector> #include "base/macros.h" -#include "base/prefs/pref_member.h" #include "build/build_config.h" #include "chrome/browser/ui/passwords/password_manager_presenter.h" #include "chrome/browser/ui/passwords/password_ui_view.h" #include "chrome/browser/ui/webui/options/options_ui.h" +#include "components/prefs/pref_member.h" namespace options { diff --git a/chrome/browser/ui/webui/options/preferences_browsertest.cc b/chrome/browser/ui/webui/options/preferences_browsertest.cc index 4d57e9c..9dfdf9a 100644 --- a/chrome/browser/ui/webui/options/preferences_browsertest.cc +++ b/chrome/browser/ui/webui/options/preferences_browsertest.cc @@ -13,7 +13,6 @@ #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/memory/scoped_ptr.h" -#include "base/prefs/pref_service.h" #include "base/values.h" #include "build/build_config.h" #include "chrome/browser/chrome_notification_types.h" @@ -27,6 +26,7 @@ #include "components/policy/core/common/external_data_fetcher.h" #include "components/policy/core/common/policy_map.h" #include "components/policy/core/common/policy_types.h" +#include "components/prefs/pref_service.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" #include "content/public/browser/render_view_host.h" diff --git a/chrome/browser/ui/webui/options/preferences_browsertest.h b/chrome/browser/ui/webui/options/preferences_browsertest.h index 8a00055..143fe94 100644 --- a/chrome/browser/ui/webui/options/preferences_browsertest.h +++ b/chrome/browser/ui/webui/options/preferences_browsertest.h @@ -11,11 +11,11 @@ #include "base/compiler_specific.h" #include "base/macros.h" #include "base/memory/scoped_vector.h" -#include "base/prefs/pref_change_registrar.h" -#include "base/prefs/pref_service.h" #include "chrome/test/base/in_process_browser_test.h" #include "components/policy/core/common/mock_configuration_policy_provider.h" #include "components/policy/core/common/policy_types.h" +#include "components/prefs/pref_change_registrar.h" +#include "components/prefs/pref_service.h" #include "content/public/browser/notification_observer.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/chrome/browser/ui/webui/options/reset_profile_settings_handler.cc b/chrome/browser/ui/webui/options/reset_profile_settings_handler.cc index 2d80ae6..4a33b1f 100644 --- a/chrome/browser/ui/webui/options/reset_profile_settings_handler.cc +++ b/chrome/browser/ui/webui/options/reset_profile_settings_handler.cc @@ -10,7 +10,6 @@ #include "base/bind_helpers.h" #include "base/macros.h" #include "base/metrics/histogram.h" -#include "base/prefs/pref_service.h" #include "base/strings/string16.h" #include "base/values.h" #include "build/build_config.h" @@ -24,6 +23,7 @@ #include "chrome/common/url_constants.h" #include "chrome/grit/chromium_strings.h" #include "chrome/grit/generated_resources.h" +#include "components/prefs/pref_service.h" #include "components/strings/grit/components_strings.h" #include "content/public/browser/user_metrics.h" #include "content/public/browser/web_ui.h" diff --git a/chrome/browser/ui/webui/options/startup_pages_handler.cc b/chrome/browser/ui/webui/options/startup_pages_handler.cc index c7718f0..cc3d269 100644 --- a/chrome/browser/ui/webui/options/startup_pages_handler.cc +++ b/chrome/browser/ui/webui/options/startup_pages_handler.cc @@ -9,7 +9,6 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/macros.h" -#include "base/prefs/pref_service.h" #include "chrome/browser/autocomplete/chrome_autocomplete_provider_client.h" #include "chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h" #include "chrome/browser/chrome_notification_types.h" @@ -24,6 +23,7 @@ #include "components/omnibox/browser/autocomplete_controller.h" #include "components/omnibox/browser/autocomplete_input.h" #include "components/omnibox/browser/autocomplete_result.h" +#include "components/prefs/pref_service.h" #include "components/url_formatter/url_fixer.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/web_ui.h" diff --git a/chrome/browser/ui/webui/options/startup_pages_handler.h b/chrome/browser/ui/webui/options/startup_pages_handler.h index 7c1b82f..b86bdd3 100644 --- a/chrome/browser/ui/webui/options/startup_pages_handler.h +++ b/chrome/browser/ui/webui/options/startup_pages_handler.h @@ -9,10 +9,10 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" -#include "base/prefs/pref_change_registrar.h" -#include "base/prefs/pref_member.h" #include "chrome/browser/ui/webui/options/options_ui.h" #include "components/omnibox/browser/autocomplete_controller_delegate.h" +#include "components/prefs/pref_change_registrar.h" +#include "components/prefs/pref_member.h" #include "ui/base/models/table_model_observer.h" class AutocompleteController; diff --git a/chrome/browser/ui/webui/options/supervised_user_import_handler.cc b/chrome/browser/ui/webui/options/supervised_user_import_handler.cc index 4af6aeb..89a3360 100644 --- a/chrome/browser/ui/webui/options/supervised_user_import_handler.cc +++ b/chrome/browser/ui/webui/options/supervised_user_import_handler.cc @@ -10,7 +10,6 @@ #include "base/bind.h" #include "base/macros.h" -#include "base/prefs/pref_service.h" #include "base/values.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile.h" @@ -26,6 +25,7 @@ #include "chrome/browser/supervised_user/supervised_user_constants.h" #include "chrome/common/url_constants.h" #include "chrome/grit/generated_resources.h" +#include "components/prefs/pref_service.h" #include "components/signin/core/browser/signin_error_controller.h" #include "components/signin/core/browser/signin_manager.h" #include "content/public/browser/web_ui.h" diff --git a/chrome/browser/ui/webui/options/sync_setup_handler.cc b/chrome/browser/ui/webui/options/sync_setup_handler.cc index e4a3ae5..14e2a4b 100644 --- a/chrome/browser/ui/webui/options/sync_setup_handler.cc +++ b/chrome/browser/ui/webui/options/sync_setup_handler.cc @@ -15,7 +15,6 @@ #include "base/json/json_writer.h" #include "base/macros.h" #include "base/metrics/histogram.h" -#include "base/prefs/pref_service.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "build/build_config.h" @@ -45,6 +44,7 @@ #include "components/autofill/core/common/autofill_pref_names.h" #include "components/browser_sync/browser/profile_sync_service.h" #include "components/google/core/browser/google_util.h" +#include "components/prefs/pref_service.h" #include "components/signin/core/browser/signin_error_controller.h" #include "components/signin/core/browser/signin_header_helper.h" #include "components/signin/core/browser/signin_metrics.h" diff --git a/chrome/browser/ui/webui/options/sync_setup_handler_unittest.cc b/chrome/browser/ui/webui/options/sync_setup_handler_unittest.cc index 8312ccf..db3187a 100644 --- a/chrome/browser/ui/webui/options/sync_setup_handler_unittest.cc +++ b/chrome/browser/ui/webui/options/sync_setup_handler_unittest.cc @@ -11,7 +11,6 @@ #include "base/json/json_writer.h" #include "base/macros.h" #include "base/memory/scoped_ptr.h" -#include "base/prefs/pref_service.h" #include "base/stl_util.h" #include "base/values.h" #include "build/build_config.h" @@ -27,6 +26,7 @@ #include "chrome/test/base/scoped_testing_local_state.h" #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_profile.h" +#include "components/prefs/pref_service.h" #include "components/signin/core/browser/fake_auth_status_provider.h" #include "components/signin/core/browser/signin_manager.h" #include "components/sync_driver/sync_prefs.h" diff --git a/chrome/browser/ui/webui/plugins/plugins_handler.cc b/chrome/browser/ui/webui/plugins/plugins_handler.cc index 54bc627..7d11efa 100644 --- a/chrome/browser/ui/webui/plugins/plugins_handler.cc +++ b/chrome/browser/ui/webui/plugins/plugins_handler.cc @@ -11,8 +11,6 @@ #include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" -#include "base/prefs/pref_service.h" -#include "base/prefs/scoped_user_pref_update.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h" @@ -25,6 +23,8 @@ #include "chrome/common/pref_names.h" #include "chrome/grit/generated_resources.h" #include "components/content_settings/core/browser/host_content_settings_map.h" +#include "components/prefs/pref_service.h" +#include "components/prefs/scoped_user_pref_update.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/plugin_service.h" #include "content/public/browser/web_ui.h" diff --git a/chrome/browser/ui/webui/plugins/plugins_handler.h b/chrome/browser/ui/webui/plugins/plugins_handler.h index 977f4ab..784fd32 100644 --- a/chrome/browser/ui/webui/plugins/plugins_handler.h +++ b/chrome/browser/ui/webui/plugins/plugins_handler.h @@ -6,10 +6,10 @@ #define CHROME_BROWSER_UI_WEBUI_PLUGINS_PLUGINS_HANDLER_H_ #include "base/memory/weak_ptr.h" -#include "base/prefs/pref_member.h" #include "base/values.h" #include "chrome/browser/ui/webui/mojo_web_ui_handler.h" #include "chrome/browser/ui/webui/plugins/plugins.mojom.h" +#include "components/prefs/pref_member.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_source.h" diff --git a/chrome/browser/ui/webui/print_preview/print_preview_handler.cc b/chrome/browser/ui/webui/print_preview/print_preview_handler.cc index 2523ca7..9dd8c79 100644 --- a/chrome/browser/ui/webui/print_preview/print_preview_handler.cc +++ b/chrome/browser/ui/webui/print_preview/print_preview_handler.cc @@ -23,7 +23,6 @@ #include "base/memory/scoped_ptr.h" #include "base/metrics/histogram.h" #include "base/path_service.h" -#include "base/prefs/pref_service.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" @@ -63,6 +62,7 @@ #include "components/cloud_devices/common/printer_description.h" #include "components/dom_distiller/core/dom_distiller_switches.h" #include "components/dom_distiller/core/url_utils.h" +#include "components/prefs/pref_service.h" #include "components/printing/common/print_messages.h" #include "components/signin/core/browser/gaia_cookie_manager_service.h" #include "components/signin/core/browser/profile_oauth2_token_service.h" diff --git a/chrome/browser/ui/webui/print_preview/print_preview_ui_browsertest.cc b/chrome/browser/ui/webui/print_preview/print_preview_ui_browsertest.cc index f2604fc..f7e4d73 100644 --- a/chrome/browser/ui/webui/print_preview/print_preview_ui_browsertest.cc +++ b/chrome/browser/ui/webui/print_preview/print_preview_ui_browsertest.cc @@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/prefs/pref_service.h" #include "base/strings/utf_string_conversions.h" #include "build/build_config.h" #include "chrome/app/chrome_command_ids.h" @@ -16,6 +15,7 @@ #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" #include "components/content_settings/core/browser/host_content_settings_map.h" +#include "components/prefs/pref_service.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_observer.h" #include "content/public/test/browser_test_utils.h" diff --git a/chrome/browser/ui/webui/print_preview/print_preview_ui_unittest.cc b/chrome/browser/ui/webui/print_preview/print_preview_ui_unittest.cc index 7adf85e..9bd19f3 100644 --- a/chrome/browser/ui/webui/print_preview/print_preview_ui_unittest.cc +++ b/chrome/browser/ui/webui/print_preview/print_preview_ui_unittest.cc @@ -8,7 +8,6 @@ #include "base/macros.h" #include "base/memory/ref_counted_memory.h" -#include "base/prefs/pref_service.h" #include "chrome/browser/printing/print_preview_dialog_controller.h" #include "chrome/browser/printing/print_preview_test.h" #include "chrome/browser/printing/print_view_manager.h" @@ -17,6 +16,7 @@ #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/browser/ui/webui/print_preview/print_preview_ui.h" #include "chrome/test/base/browser_with_test_window_test.h" +#include "components/prefs/pref_service.h" #include "components/web_modal/web_contents_modal_dialog_manager.h" #include "content/public/browser/plugin_service.h" #include "content/public/browser/site_instance.h" diff --git a/chrome/browser/ui/webui/print_preview/sticky_settings.cc b/chrome/browser/ui/webui/print_preview/sticky_settings.cc index e9077b1..d1c9d98 100644 --- a/chrome/browser/ui/webui/print_preview/sticky_settings.cc +++ b/chrome/browser/ui/webui/print_preview/sticky_settings.cc @@ -6,12 +6,12 @@ #include "base/command_line.h" #include "base/files/file_path.h" -#include "base/prefs/pref_service.h" #include "base/values.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "components/pref_registry/pref_registry_syncable.h" +#include "components/prefs/pref_service.h" #include "printing/page_size_margins.h" namespace printing { diff --git a/chrome/browser/ui/webui/profile_info_watcher.cc b/chrome/browser/ui/webui/profile_info_watcher.cc index 48e9b62..b49ca13 100644 --- a/chrome/browser/ui/webui/profile_info_watcher.cc +++ b/chrome/browser/ui/webui/profile_info_watcher.cc @@ -6,13 +6,13 @@ #include "base/bind.h" #include "base/bind_helpers.h" -#include "base/prefs/pref_service.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_info_cache.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/signin/signin_manager_factory.h" #include "chrome/common/pref_names.h" +#include "components/prefs/pref_service.h" #include "components/signin/core/browser/signin_manager.h" #include "components/signin/core/common/signin_pref_names.h" diff --git a/chrome/browser/ui/webui/profile_info_watcher.h b/chrome/browser/ui/webui/profile_info_watcher.h index 17c02d7..dc93645 100644 --- a/chrome/browser/ui/webui/profile_info_watcher.h +++ b/chrome/browser/ui/webui/profile_info_watcher.h @@ -9,8 +9,8 @@ #include "base/callback.h" #include "base/macros.h" -#include "base/prefs/pref_member.h" #include "chrome/browser/profiles/profile_info_cache_observer.h" +#include "components/prefs/pref_member.h" class Profile; class SigninManagerBase; diff --git a/chrome/browser/ui/webui/set_as_default_browser_ui.cc b/chrome/browser/ui/webui/set_as_default_browser_ui.cc index 0512b99..eac291a 100644 --- a/chrome/browser/ui/webui/set_as_default_browser_ui.cc +++ b/chrome/browser/ui/webui/set_as_default_browser_ui.cc @@ -9,7 +9,6 @@ #include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/metrics/histogram.h" -#include "base/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/shell_integration.h" #include "chrome/browser/ui/browser.h" @@ -28,6 +27,7 @@ #include "chrome/grit/generated_resources.h" #include "chrome/grit/locale_settings.h" #include "chrome/installer/util/install_util.h" +#include "components/prefs/pref_service.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_delegate.h" diff --git a/chrome/browser/ui/webui/settings/downloads_handler.cc b/chrome/browser/ui/webui/settings/downloads_handler.cc index b35f2db..58eee71 100644 --- a/chrome/browser/ui/webui/settings/downloads_handler.cc +++ b/chrome/browser/ui/webui/settings/downloads_handler.cc @@ -4,8 +4,6 @@ #include "chrome/browser/ui/webui/settings/downloads_handler.h" -#include "base/prefs/pref_service.h" -#include "base/prefs/scoped_user_pref_update.h" #include "base/values.h" #include "chrome/browser/download/download_prefs.h" #include "chrome/browser/profiles/profile.h" @@ -13,6 +11,8 @@ #include "chrome/common/pref_names.h" #include "chrome/grit/chromium_strings.h" #include "chrome/grit/settings_strings.h" +#include "components/prefs/pref_service.h" +#include "components/prefs/scoped_user_pref_update.h" #include "content/public/browser/user_metrics.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_ui.h" diff --git a/chrome/browser/ui/webui/settings/font_handler.cc b/chrome/browser/ui/webui/settings/font_handler.cc index ff34281..fb24a8f 100644 --- a/chrome/browser/ui/webui/settings/font_handler.cc +++ b/chrome/browser/ui/webui/settings/font_handler.cc @@ -9,12 +9,12 @@ #include "base/bind_helpers.h" #include "base/i18n/rtl.h" -#include "base/prefs/pref_service.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/character_encoding.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/webui/options/font_settings_utils.h" #include "chrome/common/pref_names.h" +#include "components/prefs/pref_service.h" #include "content/public/browser/font_list_async.h" #include "content/public/browser/web_ui.h" diff --git a/chrome/browser/ui/webui/settings/languages_handler.cc b/chrome/browser/ui/webui/settings/languages_handler.cc index 80dd727..eeebaf9 100644 --- a/chrome/browser/ui/webui/settings/languages_handler.cc +++ b/chrome/browser/ui/webui/settings/languages_handler.cc @@ -12,9 +12,9 @@ #include "content/public/browser/web_ui.h" #if defined(OS_WIN) -#include "base/prefs/pref_service.h" #include "chrome/browser/browser_process.h" #include "chrome/common/pref_names.h" +#include "components/prefs/pref_service.h" #endif #if defined(OS_CHROMEOS) diff --git a/chrome/browser/ui/webui/settings/people_handler.cc b/chrome/browser/ui/webui/settings/people_handler.cc index 754ff46..17d45e9 100644 --- a/chrome/browser/ui/webui/settings/people_handler.cc +++ b/chrome/browser/ui/webui/settings/people_handler.cc @@ -14,7 +14,6 @@ #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/metrics/histogram.h" -#include "base/prefs/pref_service.h" #include "base/values.h" #include "build/build_config.h" #include "chrome/browser/browser_process.h" @@ -40,6 +39,7 @@ #include "chrome/common/chrome_switches.h" #include "chrome/grit/generated_resources.h" #include "components/browser_sync/browser/profile_sync_service.h" +#include "components/prefs/pref_service.h" #include "components/signin/core/browser/signin_error_controller.h" #include "components/signin/core/browser/signin_header_helper.h" #include "components/signin/core/browser/signin_metrics.h" diff --git a/chrome/browser/ui/webui/settings/people_handler.h b/chrome/browser/ui/webui/settings/people_handler.h index 016aa5f9..9a30a15 100644 --- a/chrome/browser/ui/webui/settings/people_handler.h +++ b/chrome/browser/ui/webui/settings/people_handler.h @@ -8,7 +8,6 @@ #include "base/gtest_prod_util.h" #include "base/macros.h" #include "base/memory/scoped_ptr.h" -#include "base/prefs/pref_change_registrar.h" #include "base/scoped_observer.h" #include "base/strings/utf_string_conversions.h" #include "base/timer/timer.h" @@ -16,6 +15,7 @@ #include "chrome/browser/profiles/profile_info_cache_observer.h" #include "chrome/browser/sync/sync_startup_tracker.h" #include "chrome/browser/ui/webui/signin/login_ui_service.h" +#include "components/prefs/pref_change_registrar.h" #include "components/signin/core/browser/signin_manager_base.h" #include "components/sync_driver/sync_service_observer.h" #include "content/public/browser/web_ui_message_handler.h" diff --git a/chrome/browser/ui/webui/settings/people_handler_unittest.cc b/chrome/browser/ui/webui/settings/people_handler_unittest.cc index e1207db..0cf6701 100644 --- a/chrome/browser/ui/webui/settings/people_handler_unittest.cc +++ b/chrome/browser/ui/webui/settings/people_handler_unittest.cc @@ -11,7 +11,6 @@ #include "base/json/json_writer.h" #include "base/macros.h" #include "base/memory/scoped_ptr.h" -#include "base/prefs/pref_service.h" #include "base/stl_util.h" #include "base/values.h" #include "build/build_config.h" @@ -28,6 +27,7 @@ #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_profile.h" #include "chrome/test/base/testing_profile_manager.h" +#include "components/prefs/pref_service.h" #include "components/signin/core/browser/fake_auth_status_provider.h" #include "components/signin/core/browser/signin_manager.h" #include "components/sync_driver/sync_prefs.h" diff --git a/chrome/browser/ui/webui/settings/reset_settings_handler.cc b/chrome/browser/ui/webui/settings/reset_settings_handler.cc index 50f42b4..9a6e28f 100644 --- a/chrome/browser/ui/webui/settings/reset_settings_handler.cc +++ b/chrome/browser/ui/webui/settings/reset_settings_handler.cc @@ -9,7 +9,6 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/metrics/histogram.h" -#include "base/prefs/pref_service.h" #include "base/strings/string16.h" #include "base/time/time.h" #include "base/values.h" @@ -25,12 +24,12 @@ #include "chrome/common/url_constants.h" #include "chrome/grit/chromium_strings.h" #include "chrome/grit/generated_resources.h" +#include "components/prefs/pref_service.h" #include "content/public/browser/user_metrics.h" #include "content/public/browser/web_ui.h" #include "content/public/browser/web_ui_data_source.h" #if defined(OS_CHROMEOS) -#include "base/prefs/pref_service.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/browser_process_platform_part.h" #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" @@ -38,6 +37,7 @@ #include "chrome/common/pref_names.h" #include "chromeos/dbus/dbus_thread_manager.h" #include "chromeos/dbus/power_manager_client.h" +#include "components/prefs/pref_service.h" #include "components/user_manager/user_manager.h" #endif // defined(OS_CHROMEOS) diff --git a/chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.cc b/chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.cc index a19417f..66570f1 100644 --- a/chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.cc +++ b/chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.cc @@ -9,10 +9,10 @@ #include "base/macros.h" #include "base/metrics/histogram_macros.h" #include "base/metrics/sparse_histogram.h" -#include "base/prefs/pref_service.h" #include "chrome/browser/browsing_data/browsing_data_helper.h" #include "chrome/browser/browsing_data/browsing_data_remover_factory.h" #include "chrome/common/pref_names.h" +#include "components/prefs/pref_service.h" #include "content/public/browser/web_ui.h" namespace settings { diff --git a/chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.h b/chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.h index 6f8830e..ce9a47b 100644 --- a/chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.h +++ b/chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.h @@ -7,10 +7,10 @@ #include "base/macros.h" #include "base/memory/scoped_vector.h" -#include "base/prefs/pref_member.h" #include "chrome/browser/browsing_data/browsing_data_remover.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/webui/settings/md_settings_ui.h" +#include "components/prefs/pref_member.h" namespace base { class ListValue; diff --git a/chrome/browser/ui/webui/settings/settings_default_browser_handler.cc b/chrome/browser/ui/webui/settings/settings_default_browser_handler.cc index 75fc76f..787a112 100644 --- a/chrome/browser/ui/webui/settings/settings_default_browser_handler.cc +++ b/chrome/browser/ui/webui/settings/settings_default_browser_handler.cc @@ -5,9 +5,9 @@ #include "chrome/browser/ui/webui/settings/settings_default_browser_handler.h" #include "base/bind.h" -#include "base/prefs/pref_service.h" #include "chrome/browser/browser_process.h" #include "chrome/common/pref_names.h" +#include "components/prefs/pref_service.h" #include "content/public/browser/web_ui.h" namespace settings { diff --git a/chrome/browser/ui/webui/settings/settings_default_browser_handler.h b/chrome/browser/ui/webui/settings/settings_default_browser_handler.h index fad3006..57354db 100644 --- a/chrome/browser/ui/webui/settings/settings_default_browser_handler.h +++ b/chrome/browser/ui/webui/settings/settings_default_browser_handler.h @@ -6,10 +6,10 @@ #define CHROME_BROWSER_UI_WEBUI_SETTINGS_SETTINGS_DEFAULT_BROWSER_HANDLER_H_ #include "base/macros.h" -#include "base/prefs/pref_member.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/shell_integration.h" #include "chrome/browser/ui/webui/settings/md_settings_ui.h" +#include "components/prefs/pref_member.h" namespace base { class ListValue; diff --git a/chrome/browser/ui/webui/settings/settings_manage_profile_handler.cc b/chrome/browser/ui/webui/settings/settings_manage_profile_handler.cc index a530704..3d0bf21 100644 --- a/chrome/browser/ui/webui/settings/settings_manage_profile_handler.cc +++ b/chrome/browser/ui/webui/settings/settings_manage_profile_handler.cc @@ -6,8 +6,6 @@ #include "base/bind.h" #include "base/bind_helpers.h" -#include "base/prefs/pref_service.h" -#include "base/prefs/scoped_user_pref_update.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" @@ -31,6 +29,8 @@ #include "chrome/common/url_constants.h" #include "chrome/grit/chromium_strings.h" #include "chrome/grit/generated_resources.h" +#include "components/prefs/pref_service.h" +#include "components/prefs/scoped_user_pref_update.h" #include "components/signin/core/browser/signin_manager.h" #include "components/signin/core/common/profile_management_switches.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/ui/webui/settings/settings_startup_pages_handler.h b/chrome/browser/ui/webui/settings/settings_startup_pages_handler.h index 20fca6e..f1f4868 100644 --- a/chrome/browser/ui/webui/settings/settings_startup_pages_handler.h +++ b/chrome/browser/ui/webui/settings/settings_startup_pages_handler.h @@ -6,9 +6,9 @@ #define CHROME_BROWSER_UI_WEBUI_SETTINGS_SETTINGS_STARTUP_PAGES_HANDLER_H_ #include "base/macros.h" -#include "base/prefs/pref_change_registrar.h" #include "chrome/browser/custom_home_pages_table_model.h" #include "chrome/browser/ui/webui/settings/md_settings_ui.h" +#include "components/prefs/pref_change_registrar.h" #include "ui/base/models/table_model_observer.h" namespace base { diff --git a/chrome/browser/ui/webui/signin/inline_login_handler.cc b/chrome/browser/ui/webui/signin/inline_login_handler.cc index 899607f..80d5363 100644 --- a/chrome/browser/ui/webui/signin/inline_login_handler.cc +++ b/chrome/browser/ui/webui/signin/inline_login_handler.cc @@ -7,7 +7,6 @@ #include <limits.h> #include "base/bind.h" -#include "base/prefs/pref_service.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" @@ -19,6 +18,7 @@ #include "chrome/browser/ui/browser_navigator_params.h" #include "chrome/common/pref_names.h" #include "components/metrics/metrics_pref_names.h" +#include "components/prefs/pref_service.h" #include "components/signin/core/common/signin_pref_names.h" #include "content/public/browser/storage_partition.h" #include "content/public/browser/user_metrics.h" diff --git a/chrome/browser/ui/webui/signin/inline_login_handler_impl.cc b/chrome/browser/ui/webui/signin/inline_login_handler_impl.cc index aefdf66..ab68868 100644 --- a/chrome/browser/ui/webui/signin/inline_login_handler_impl.cc +++ b/chrome/browser/ui/webui/signin/inline_login_handler_impl.cc @@ -14,7 +14,6 @@ #include "base/macros.h" #include "base/metrics/histogram.h" #include "base/metrics/user_metrics_action.h" -#include "base/prefs/pref_service.h" #include "base/single_thread_task_runner.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" @@ -48,6 +47,7 @@ #include "chrome/grit/chromium_strings.h" #include "chrome/grit/generated_resources.h" #include "components/browser_sync/browser/profile_sync_service.h" +#include "components/prefs/pref_service.h" #include "components/signin/core/browser/about_signin_internals.h" #include "components/signin/core/browser/account_tracker_service.h" #include "components/signin/core/browser/profile_oauth2_token_service.h" diff --git a/chrome/browser/ui/webui/signin/inline_login_ui_browsertest.cc b/chrome/browser/ui/webui/signin/inline_login_ui_browsertest.cc index 6be4d3d..9cb75d8 100644 --- a/chrome/browser/ui/webui/signin/inline_login_ui_browsertest.cc +++ b/chrome/browser/ui/webui/signin/inline_login_ui_browsertest.cc @@ -4,8 +4,6 @@ #include "base/command_line.h" #include "base/macros.h" -#include "base/prefs/pref_service.h" -#include "base/prefs/scoped_user_pref_update.h" #include "base/strings/utf_string_conversions.h" #include "build/build_config.h" #include "chrome/browser/content_settings/cookie_settings_factory.h" @@ -33,6 +31,8 @@ #include "components/content_settings/core/browser/cookie_settings.h" #include "components/guest_view/browser/guest_view_manager.h" #include "components/keyed_service/content/browser_context_dependency_manager.h" +#include "components/prefs/pref_service.h" +#include "components/prefs/scoped_user_pref_update.h" #include "components/signin/core/browser/fake_profile_oauth2_token_service.h" #include "components/signin/core/browser/signin_manager.h" #include "components/signin/core/common/profile_management_switches.h" diff --git a/chrome/browser/ui/webui/signin/login_ui_service_factory.cc b/chrome/browser/ui/webui/signin/login_ui_service_factory.cc index 35b275d..66c7b5c 100644 --- a/chrome/browser/ui/webui/signin/login_ui_service_factory.cc +++ b/chrome/browser/ui/webui/signin/login_ui_service_factory.cc @@ -6,10 +6,10 @@ #include "base/bind.h" #include "base/bind_helpers.h" -#include "base/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/webui/signin/login_ui_service.h" #include "components/keyed_service/content/browser_context_dependency_manager.h" +#include "components/prefs/pref_service.h" #include "components/signin/core/browser/signin_manager.h" LoginUIServiceFactory::LoginUIServiceFactory() diff --git a/chrome/browser/ui/webui/signin/user_manager_screen_handler.cc b/chrome/browser/ui/webui/signin/user_manager_screen_handler.cc index 2cc57cb..26df800 100644 --- a/chrome/browser/ui/webui/signin/user_manager_screen_handler.cc +++ b/chrome/browser/ui/webui/signin/user_manager_screen_handler.cc @@ -10,7 +10,6 @@ #include "base/bind.h" #include "base/location.h" #include "base/macros.h" -#include "base/prefs/pref_service.h" #include "base/profiler/scoped_tracker.h" #include "base/single_thread_task_runner.h" #include "base/strings/utf_string_conversions.h" @@ -43,6 +42,7 @@ #include "chrome/common/url_constants.h" #include "chrome/grit/chromium_strings.h" #include "chrome/grit/generated_resources.h" +#include "components/prefs/pref_service.h" #include "components/proximity_auth/screenlock_bridge.h" #include "components/signin/core/account_id/account_id.h" #include "content/public/browser/notification_service.h" diff --git a/chrome/browser/ui/webui/translate_internals/translate_internals_handler.cc b/chrome/browser/ui/webui/translate_internals/translate_internals_handler.cc index 1c73f90..b36e380 100644 --- a/chrome/browser/ui/webui/translate_internals/translate_internals_handler.cc +++ b/chrome/browser/ui/webui/translate_internals/translate_internals_handler.cc @@ -9,13 +9,13 @@ #include "base/bind.h" #include "base/bind_helpers.h" -#include "base/prefs/pref_service.h" #include "base/values.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/translate/chrome_translate_client.h" #include "chrome/browser/translate/translate_service.h" #include "chrome/common/pref_names.h" +#include "components/prefs/pref_service.h" #include "components/translate/core/browser/translate_download_manager.h" #include "components/translate/core/browser/translate_error_details.h" #include "components/translate/core/browser/translate_event_details.h" diff --git a/chrome/browser/ui/webui/voice_search_ui.cc b/chrome/browser/ui/webui/voice_search_ui.cc index 5c680f6..320bf6e 100644 --- a/chrome/browser/ui/webui/voice_search_ui.cc +++ b/chrome/browser/ui/webui/voice_search_ui.cc @@ -13,7 +13,6 @@ #include "base/memory/weak_ptr.h" #include "base/metrics/field_trial.h" #include "base/path_service.h" -#include "base/prefs/pref_service.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" #include "build/build_config.h" @@ -33,6 +32,7 @@ #include "chrome/common/url_constants.h" #include "chrome/grit/chromium_strings.h" #include "chrome/grit/generated_resources.h" +#include "components/prefs/pref_service.h" #include "components/version_info/version_info.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/plugin_service.h" |