diff options
Diffstat (limited to 'chrome/browser/chromeos/app_mode')
6 files changed, 9 insertions, 9 deletions
diff --git a/chrome/browser/chromeos/app_mode/app_session.cc b/chrome/browser/chromeos/app_mode/app_session.cc index 73d760c..850615e 100644 --- a/chrome/browser/chromeos/app_mode/app_session.cc +++ b/chrome/browser/chromeos/app_mode/app_session.cc @@ -11,7 +11,6 @@ #include "base/lazy_instance.h" #include "base/macros.h" #include "base/message_loop/message_loop.h" -#include "base/prefs/pref_service.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" #include "chrome/browser/chromeos/app_mode/kiosk_app_update_service.h" @@ -31,6 +30,7 @@ #include "chromeos/dbus/power_manager_client.h" #include "chromeos/network/network_state.h" #include "chromeos/network/network_state_handler.h" +#include "components/prefs/pref_service.h" #include "components/user_manager/user_manager.h" #include "content/public/browser/browser_child_process_host_iterator.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/chromeos/app_mode/kiosk_app_data.cc b/chrome/browser/chromeos/app_mode/kiosk_app_data.cc index eb68da0..1c5a874 100644 --- a/chrome/browser/chromeos/app_mode/kiosk_app_data.cc +++ b/chrome/browser/chromeos/app_mode/kiosk_app_data.cc @@ -11,8 +11,6 @@ #include "base/json/json_writer.h" #include "base/macros.h" #include "base/memory/ref_counted_memory.h" -#include "base/prefs/pref_service.h" -#include "base/prefs/scoped_user_pref_update.h" #include "base/threading/sequenced_worker_pool.h" #include "base/values.h" #include "chrome/browser/browser_process.h" @@ -24,6 +22,8 @@ #include "chrome/browser/extensions/webstore_install_helper.h" #include "chrome/browser/image_decoder.h" #include "chrome/browser/profiles/profile.h" +#include "components/prefs/pref_service.h" +#include "components/prefs/scoped_user_pref_update.h" #include "content/public/browser/browser_thread.h" #include "extensions/browser/extension_system.h" #include "extensions/browser/image_loader.h" diff --git a/chrome/browser/chromeos/app_mode/kiosk_app_launch_error.cc b/chrome/browser/chromeos/app_mode/kiosk_app_launch_error.cc index 0a01a20..8449d22 100644 --- a/chrome/browser/chromeos/app_mode/kiosk_app_launch_error.cc +++ b/chrome/browser/chromeos/app_mode/kiosk_app_launch_error.cc @@ -4,10 +4,10 @@ #include "chrome/browser/chromeos/app_mode/kiosk_app_launch_error.h" -#include "base/prefs/scoped_user_pref_update.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" #include "chrome/grit/generated_resources.h" +#include "components/prefs/scoped_user_pref_update.h" #include "ui/base/l10n/l10n_util.h" namespace chromeos { diff --git a/chrome/browser/chromeos/app_mode/kiosk_app_manager.cc b/chrome/browser/chromeos/app_mode/kiosk_app_manager.cc index 495add5..f20e31c 100644 --- a/chrome/browser/chromeos/app_mode/kiosk_app_manager.cc +++ b/chrome/browser/chromeos/app_mode/kiosk_app_manager.cc @@ -15,9 +15,6 @@ #include "base/files/file_util.h" #include "base/logging.h" #include "base/path_service.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/pref_service.h" -#include "base/prefs/scoped_user_pref_update.h" #include "base/stl_util.h" #include "base/sys_info.h" #include "chrome/browser/browser_process.h" @@ -41,6 +38,9 @@ #include "chromeos/dbus/dbus_thread_manager.h" #include "chromeos/settings/cros_settings_names.h" #include "components/ownership/owner_key_util.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/pref_service.h" +#include "components/prefs/scoped_user_pref_update.h" #include "components/signin/core/account_id/account_id.h" #include "components/user_manager/user_manager.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/chromeos/app_mode/kiosk_app_manager_browsertest.cc b/chrome/browser/chromeos/app_mode/kiosk_app_manager_browsertest.cc index df82709..545646b 100644 --- a/chrome/browser/chromeos/app_mode/kiosk_app_manager_browsertest.cc +++ b/chrome/browser/chromeos/app_mode/kiosk_app_manager_browsertest.cc @@ -13,7 +13,6 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" #include "base/path_service.h" -#include "base/prefs/scoped_user_pref_update.h" #include "base/strings/stringprintf.h" #include "base/values.h" #include "chrome/browser/browser_process.h" @@ -28,6 +27,7 @@ #include "chrome/common/chrome_switches.h" #include "chrome/test/base/in_process_browser_test.h" #include "chromeos/settings/cros_settings_names.h" +#include "components/prefs/scoped_user_pref_update.h" #include "content/public/test/test_utils.h" #include "extensions/common/extension.h" #include "net/base/host_port_pair.h" diff --git a/chrome/browser/chromeos/app_mode/kiosk_app_update_service_browsertest.cc b/chrome/browser/chromeos/app_mode/kiosk_app_update_service_browsertest.cc index 5307b33..b22a711 100644 --- a/chrome/browser/chromeos/app_mode/kiosk_app_update_service_browsertest.cc +++ b/chrome/browser/chromeos/app_mode/kiosk_app_update_service_browsertest.cc @@ -17,7 +17,6 @@ #include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" -#include "base/prefs/pref_service.h" #include "base/run_loop.h" #include "base/single_thread_task_runner.h" #include "base/strings/string_number_conversions.h" @@ -35,6 +34,7 @@ #include "chrome/common/pref_names.h" #include "chromeos/chromeos_paths.h" #include "chromeos/dbus/update_engine_client.h" +#include "components/prefs/pref_service.h" #include "content/public/browser/browser_thread.h" #include "extensions/common/extension.h" #include "extensions/test/extension_test_message_listener.h" |