diff options
Diffstat (limited to 'chrome/browser/chromeos/system')
9 files changed, 14 insertions, 14 deletions
diff --git a/chrome/browser/chromeos/system/automatic_reboot_manager.cc b/chrome/browser/chromeos/system/automatic_reboot_manager.cc index acaaa2e..ef9871d 100644 --- a/chrome/browser/chromeos/system/automatic_reboot_manager.cc +++ b/chrome/browser/chromeos/system/automatic_reboot_manager.cc @@ -24,8 +24,6 @@ #include "base/message_loop/message_loop.h" #include "base/path_service.h" #include "base/posix/eintr_wrapper.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/pref_service.h" #include "base/single_thread_task_runner.h" #include "base/strings/string_number_conversions.h" #include "base/thread_task_runner_handle.h" @@ -38,6 +36,8 @@ #include "chromeos/chromeos_paths.h" #include "chromeos/chromeos_switches.h" #include "chromeos/dbus/dbus_thread_manager.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/pref_service.h" #include "components/user_manager/user_manager.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_details.h" diff --git a/chrome/browser/chromeos/system/automatic_reboot_manager.h b/chrome/browser/chromeos/system/automatic_reboot_manager.h index c961308..7e813be 100644 --- a/chrome/browser/chromeos/system/automatic_reboot_manager.h +++ b/chrome/browser/chromeos/system/automatic_reboot_manager.h @@ -10,12 +10,12 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" -#include "base/prefs/pref_change_registrar.h" #include "base/time/time.h" #include "base/timer/timer.h" #include "chrome/browser/chromeos/system/automatic_reboot_manager_observer.h" #include "chromeos/dbus/power_manager_client.h" #include "chromeos/dbus/update_engine_client.h" +#include "components/prefs/pref_change_registrar.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "ui/base/user_activity/user_activity_observer.h" diff --git a/chrome/browser/chromeos/system/automatic_reboot_manager_unittest.cc b/chrome/browser/chromeos/system/automatic_reboot_manager_unittest.cc index 96ad4a21..0fd1cc2 100644 --- a/chrome/browser/chromeos/system/automatic_reboot_manager_unittest.cc +++ b/chrome/browser/chromeos/system/automatic_reboot_manager_unittest.cc @@ -16,8 +16,6 @@ #include "base/memory/ref_counted.h" #include "base/message_loop/message_loop.h" #include "base/path_service.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/testing_pref_service.h" #include "base/run_loop.h" #include "base/strings/string_number_conversions.h" #include "base/test/simple_test_tick_clock.h" @@ -36,6 +34,8 @@ #include "chromeos/dbus/dbus_thread_manager.h" #include "chromeos/dbus/fake_power_manager_client.h" #include "chromeos/dbus/fake_update_engine_client.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/testing_pref_service.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_service.h" diff --git a/chrome/browser/chromeos/system/device_disabling_manager.cc b/chrome/browser/chromeos/system/device_disabling_manager.cc index 9bc2b41..9f5780a 100644 --- a/chrome/browser/chromeos/system/device_disabling_manager.cc +++ b/chrome/browser/chromeos/system/device_disabling_manager.cc @@ -7,7 +7,6 @@ #include "base/bind.h" #include "base/command_line.h" #include "base/logging.h" -#include "base/prefs/pref_service.h" #include "base/values.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/browser_process_platform_part.h" @@ -20,6 +19,7 @@ #include "chromeos/settings/cros_settings_names.h" #include "chromeos/settings/cros_settings_provider.h" #include "components/policy/core/common/cloud/cloud_policy_constants.h" +#include "components/prefs/pref_service.h" #include "components/user_manager/user_manager.h" namespace chromeos { diff --git a/chrome/browser/chromeos/system/device_disabling_manager_unittest.cc b/chrome/browser/chromeos/system/device_disabling_manager_unittest.cc index b27b69a..84dbc27 100644 --- a/chrome/browser/chromeos/system/device_disabling_manager_unittest.cc +++ b/chrome/browser/chromeos/system/device_disabling_manager_unittest.cc @@ -9,8 +9,6 @@ #include "base/command_line.h" #include "base/macros.h" #include "base/memory/ref_counted.h" -#include "base/prefs/scoped_user_pref_update.h" -#include "base/prefs/testing_pref_service.h" #include "base/run_loop.h" #include "chrome/browser/browser_process_platform_part.h" #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" @@ -25,6 +23,8 @@ #include "chromeos/chromeos_switches.h" #include "components/ownership/mock_owner_key_util.h" #include "components/policy/core/common/cloud/cloud_policy_constants.h" +#include "components/prefs/scoped_user_pref_update.h" +#include "components/prefs/testing_pref_service.h" #include "components/user_manager/fake_user_manager.h" #include "content/public/test/test_browser_thread_bundle.h" #include "policy/proto/device_management_backend.pb.h" diff --git a/chrome/browser/chromeos/system/input_device_settings.cc b/chrome/browser/chromeos/system/input_device_settings.cc index fd6b6df..980f0fc 100644 --- a/chrome/browser/chromeos/system/input_device_settings.cc +++ b/chrome/browser/chromeos/system/input_device_settings.cc @@ -4,13 +4,13 @@ #include "chrome/browser/chromeos/system/input_device_settings.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/pref_service.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h" #include "chrome/common/pref_names.h" #include "chromeos/system/statistics_provider.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/pref_service.h" namespace chromeos { namespace system { diff --git a/chrome/browser/chromeos/system/system_clock.cc b/chrome/browser/chromeos/system/system_clock.cc index 2b3fdc8..bfec96f 100644 --- a/chrome/browser/chromeos/system/system_clock.cc +++ b/chrome/browser/chromeos/system/system_clock.cc @@ -6,8 +6,6 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" -#include "base/prefs/pref_change_registrar.h" -#include "base/prefs/pref_service.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h" #include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.h" @@ -19,6 +17,8 @@ #include "chrome/common/pref_names.h" #include "chromeos/login/login_state.h" #include "chromeos/settings/cros_settings_names.h" +#include "components/prefs/pref_change_registrar.h" +#include "components/prefs/pref_service.h" #include "components/user_manager/user.h" #include "components/user_manager/user_manager.h" #include "content/public/browser/notification_service.h" diff --git a/chrome/browser/chromeos/system/timezone_util.cc b/chrome/browser/chromeos/system/timezone_util.cc index a4e66af..f4aab3d 100644 --- a/chrome/browser/chromeos/system/timezone_util.cc +++ b/chrome/browser/chromeos/system/timezone_util.cc @@ -10,7 +10,6 @@ #include "base/i18n/rtl.h" #include "base/lazy_instance.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" @@ -24,6 +23,7 @@ #include "chrome/grit/generated_resources.h" #include "chromeos/settings/timezone_settings.h" #include "chromeos/timezone/timezone_request.h" +#include "components/prefs/pref_service.h" #include "components/user_manager/user_manager.h" #include "third_party/icu/source/common/unicode/ures.h" #include "third_party/icu/source/common/unicode/utypes.h" diff --git a/chrome/browser/chromeos/system/tray_accessibility_browsertest.cc b/chrome/browser/chromeos/system/tray_accessibility_browsertest.cc index b6e2b8a..7e4a90e 100644 --- a/chrome/browser/chromeos/system/tray_accessibility_browsertest.cc +++ b/chrome/browser/chromeos/system/tray_accessibility_browsertest.cc @@ -11,7 +11,6 @@ #include "ash/test/test_session_state_delegate.h" #include "base/callback.h" #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" @@ -32,6 +31,7 @@ #include "components/policy/core/common/mock_configuration_policy_provider.h" #include "components/policy/core/common/policy_map.h" #include "components/policy/core/common/policy_types.h" +#include "components/prefs/pref_service.h" #include "components/user_manager/user_manager.h" #include "content/public/test/test_utils.h" #include "policy/policy_constants.h" |