Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6671)

Unified Diff: chrome/browser/policy/profile_policy_connector.cc

Issue 444903002: [cros] user_manager component - move UserManagerBase and UserManager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/policy/profile_policy_connector.cc
diff --git a/chrome/browser/policy/profile_policy_connector.cc b/chrome/browser/policy/profile_policy_connector.cc
index 85694c2a42886eb154b87c627a0cf25aa7228774..cd93a32454dc44c42e53117a2562822282a16f12 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_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"
+#include "components/user_manager/user_manager.h"
#endif
namespace policy {
@@ -106,7 +106,8 @@ void ProfilePolicyConnector::Init(
new LoginProfilePolicyProvider(connector->GetPolicyService()));
} else {
// |user| should never be NULL except for the signin profile.
- is_primary_user_ = user == chromeos::UserManager::Get()->GetPrimaryUser();
+ is_primary_user_ =
+ user == user_manager::UserManager::Get()->GetPrimaryUser();
special_user_policy_provider_ = DeviceLocalAccountPolicyProvider::Create(
user->email(),
connector->GetDeviceLocalAccountPolicyService());

Powered by Google App Engine
This is Rietveld 408576698