diff options
| author | brettw <brettw@chromium.org> | 2016-02-01 14:11:38 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-02-01 22:12:35 +0000 |
| commit | f00b9b402a67812bff2fc2372690ab561e93b416 (patch) | |
| tree | 900b483366a96c879470e6dd258a544084b43b8a /components/user_manager | |
| parent | 2a1a66fe10ab3d4de81b891497f4d25037e09af1 (diff) | |
| download | chromium_src-f00b9b402a67812bff2fc2372690ab561e93b416.zip chromium_src-f00b9b402a67812bff2fc2372690ab561e93b416.tar.gz chromium_src-f00b9b402a67812bff2fc2372690ab561e93b416.tar.bz2 | |
Update components for new prefs location.
This is a search-and-replace update for includes with "base/prefs" ->
"components/prefs" and the headers re-sorted.
DEPS files were updated to allow the components in question to depend on
components/prefs.
This should be a no-op from a build perspective.
BUG=583034
Review URL: https://codereview.chromium.org/1651203002
Cr-Commit-Position: refs/heads/master@{#372780}
Diffstat (limited to 'components/user_manager')
| -rw-r--r-- | components/user_manager/DEPS | 1 | ||||
| -rw-r--r-- | components/user_manager/known_user.cc | 4 | ||||
| -rw-r--r-- | components/user_manager/user_manager_base.cc | 6 |
3 files changed, 6 insertions, 5 deletions
diff --git a/components/user_manager/DEPS b/components/user_manager/DEPS index 7411deb..57a407f 100644 --- a/components/user_manager/DEPS +++ b/components/user_manager/DEPS @@ -1,6 +1,7 @@ include_rules = [ "+chromeos/chromeos_switches.h", "+chromeos/login/user_names.h", +"+components/prefs", "+components/session_manager/core/session_manager.h", "+components/signin/core/account_id/account_id.h", "+google_apis/gaia/gaia_auth_util.h", diff --git a/components/user_manager/known_user.cc b/components/user_manager/known_user.cc index 18c1fac..973e12b 100644 --- a/components/user_manager/known_user.cc +++ b/components/user_manager/known_user.cc @@ -8,9 +8,9 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/scoped_user_pref_update.h" #include "base/values.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/scoped_user_pref_update.h" #include "components/user_manager/user_manager.h" #include "google_apis/gaia/gaia_auth_util.h" diff --git a/components/user_manager/user_manager_base.cc b/components/user_manager/user_manager_base.cc index 00d81e7..c45efef 100644 --- a/components/user_manager/user_manager_base.cc +++ b/components/user_manager/user_manager_base.cc @@ -17,14 +17,14 @@ #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/string_util.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "base/task_runner.h" #include "base/values.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/pref_service.h" +#include "components/prefs/scoped_user_pref_update.h" #include "components/session_manager/core/session_manager.h" #include "components/user_manager/known_user.h" #include "components/user_manager/remove_user_delegate.h" |