diff options
Diffstat (limited to 'chrome/browser/chromeos/input_method')
6 files changed, 7 insertions, 7 deletions
diff --git a/chrome/browser/chromeos/input_method/input_method_delegate_impl.cc b/chrome/browser/chromeos/input_method/input_method_delegate_impl.cc index aee6783..34f4dd5 100644 --- a/chrome/browser/chromeos/input_method/input_method_delegate_impl.cc +++ b/chrome/browser/chromeos/input_method/input_method_delegate_impl.cc @@ -5,10 +5,10 @@ #include "chrome/browser/chromeos/input_method/input_method_delegate_impl.h" #include "base/logging.h" -#include "base/prefs/pref_service.h" #include "base/strings/string_util.h" #include "chrome/browser/browser_process.h" #include "chrome/common/pref_names.h" +#include "components/prefs/pref_service.h" #include "ui/base/l10n/l10n_util.h" namespace chromeos { diff --git a/chrome/browser/chromeos/input_method/input_method_manager_impl.cc b/chrome/browser/chromeos/input_method/input_method_manager_impl.cc index f5ed114..fe3a1d14 100644 --- a/chrome/browser/chromeos/input_method/input_method_manager_impl.cc +++ b/chrome/browser/chromeos/input_method/input_method_manager_impl.cc @@ -15,7 +15,6 @@ #include "base/memory/scoped_ptr.h" #include "base/metrics/histogram.h" #include "base/metrics/sparse_histogram.h" -#include "base/prefs/pref_service.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" @@ -29,6 +28,7 @@ #include "chrome/browser/chromeos/profiles/profile_helper.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/common/pref_names.h" +#include "components/prefs/pref_service.h" #include "components/user_manager/user_manager.h" #include "third_party/icu/source/common/unicode/uloc.h" #include "ui/base/accelerators/accelerator.h" diff --git a/chrome/browser/chromeos/input_method/input_method_persistence.cc b/chrome/browser/chromeos/input_method/input_method_persistence.cc index 7bc298f..9c7f8ed 100644 --- a/chrome/browser/chromeos/input_method/input_method_persistence.cc +++ b/chrome/browser/chromeos/input_method/input_method_persistence.cc @@ -5,8 +5,6 @@ #include "chrome/browser/chromeos/input_method/input_method_persistence.h" #include "base/logging.h" -#include "base/prefs/pref_service.h" -#include "base/prefs/scoped_user_pref_update.h" #include "base/sys_info.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chromeos/input_method/input_method_util.h" @@ -14,6 +12,8 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/common/pref_names.h" +#include "components/prefs/pref_service.h" +#include "components/prefs/scoped_user_pref_update.h" namespace chromeos { namespace input_method { diff --git a/chrome/browser/chromeos/input_method/input_method_persistence_unittest.cc b/chrome/browser/chromeos/input_method/input_method_persistence_unittest.cc index ad88581..75cf550 100644 --- a/chrome/browser/chromeos/input_method/input_method_persistence_unittest.cc +++ b/chrome/browser/chromeos/input_method/input_method_persistence_unittest.cc @@ -5,7 +5,6 @@ #include "chrome/browser/chromeos/input_method/input_method_persistence.h" #include "base/command_line.h" -#include "base/prefs/pref_service.h" #include "chrome/browser/chromeos/input_method/mock_input_method_manager.h" #include "chrome/browser/chromeos/language_preferences.h" #include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h" @@ -19,6 +18,7 @@ #include "chrome/test/base/testing_profile.h" #include "chrome/test/base/testing_profile_manager.h" #include "chromeos/chromeos_switches.h" +#include "components/prefs/pref_service.h" #include "components/syncable_prefs/testing_pref_service_syncable.h" #include "content/public/test/test_browser_thread_bundle.h" diff --git a/chrome/browser/chromeos/input_method/input_method_syncer.h b/chrome/browser/chromeos/input_method/input_method_syncer.h index f68910b..e79d37f 100644 --- a/chrome/browser/chromeos/input_method/input_method_syncer.h +++ b/chrome/browser/chromeos/input_method/input_method_syncer.h @@ -9,7 +9,7 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" -#include "base/prefs/pref_member.h" +#include "components/prefs/pref_member.h" #include "components/syncable_prefs/pref_service_syncable_observer.h" #include "ui/base/ime/chromeos/input_method_manager.h" diff --git a/chrome/browser/chromeos/input_method/input_method_util.cc b/chrome/browser/chromeos/input_method/input_method_util.cc index 024081f..9797160 100644 --- a/chrome/browser/chromeos/input_method/input_method_util.cc +++ b/chrome/browser/chromeos/input_method/input_method_util.cc @@ -13,11 +13,11 @@ #include "base/macros.h" #include "base/memory/scoped_ptr.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" #include "chrome/common/extensions/extension_constants.h" +#include "components/prefs/pref_service.h" // TODO(nona): move this header from this file. #include "chrome/grit/generated_resources.h" |