diff options
| author | nkostylev@chromium.org <nkostylev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-23 14:51:59 +0000 |
|---|---|---|
| committer | nkostylev@chromium.org <nkostylev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-23 14:51:59 +0000 |
| commit | 2fda997ecb56189df96c01b5fd78c277c7da6ac3 (patch) | |
| tree | 301a25d8f2366ec2f516571df2c5e478c9988c14 /chrome/browser/policy/profile_policy_connector.cc | |
| parent | 147bb4254d86e64c9577b08694c41cf82cc06c60 (diff) | |
| download | chromium_src-2fda997ecb56189df96c01b5fd78c277c7da6ac3.zip chromium_src-2fda997ecb56189df96c01b5fd78c277c7da6ac3.tar.gz chromium_src-2fda997ecb56189df96c01b5fd78c277c7da6ac3.tar.bz2 | |
[cros] Move User class to user_manager component.
Depends on https://codereview.chromium.org/400973002/
BUG=387614
TBR=zelidrag@chromium.org,derat@chromium.org,stevenjb@chromium.org
Review URL: https://codereview.chromium.org/398753004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@284925 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/policy/profile_policy_connector.cc')
| -rw-r--r-- | chrome/browser/policy/profile_policy_connector.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/policy/profile_policy_connector.cc b/chrome/browser/policy/profile_policy_connector.cc index bca188a..85694c2 100644 --- a/chrome/browser/policy/profile_policy_connector.cc +++ b/chrome/browser/policy/profile_policy_connector.cc @@ -20,12 +20,12 @@ #include "google_apis/gaia/gaia_auth_util.h" #if defined(OS_CHROMEOS) -#include "chrome/browser/chromeos/login/users/user.h" #include "chrome/browser/chromeos/login/users/user_manager.h" #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h" #include "chrome/browser/chromeos/policy/device_local_account_policy_provider.h" #include "chrome/browser/chromeos/policy/login_profile_policy_provider.h" +#include "components/user_manager/user.h" #endif namespace policy { @@ -56,7 +56,7 @@ ProfilePolicyConnector::~ProfilePolicyConnector() {} void ProfilePolicyConnector::Init( bool force_immediate_load, #if defined(OS_CHROMEOS) - const chromeos::User* user, + const user_manager::User* user, #endif SchemaRegistry* schema_registry, CloudPolicyManager* user_cloud_policy_manager) { |