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

Unified Diff: chrome/browser/supervised_user/chromeos/manager_password_service.cc

Issue 398753004: [cros] Move User class to user_manager component. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 5 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/supervised_user/chromeos/manager_password_service.cc
diff --git a/chrome/browser/supervised_user/chromeos/manager_password_service.cc b/chrome/browser/supervised_user/chromeos/manager_password_service.cc
index ece93d4f798e2fcb6268341000e41b4030cd9ac8..2580d05ed2ef5c67fd65179087f7d00849a12c00 100644
--- a/chrome/browser/supervised_user/chromeos/manager_password_service.cc
+++ b/chrome/browser/supervised_user/chromeos/manager_password_service.cc
@@ -11,12 +11,12 @@
#include "chrome/browser/chromeos/login/supervised/supervised_user_authentication.h"
#include "chrome/browser/chromeos/login/supervised/supervised_user_constants.h"
#include "chrome/browser/chromeos/login/users/supervised_user_manager.h"
-#include "chrome/browser/chromeos/login/users/user.h"
#include "chrome/browser/chromeos/login/users/user_manager.h"
#include "chrome/browser/supervised_user/supervised_user_constants.h"
#include "chrome/browser/supervised_user/supervised_user_sync_service.h"
#include "chromeos/login/auth/key.h"
#include "chromeos/login/auth/user_context.h"
+#include "components/user_manager/user.h"
#include "components/user_manager/user_type.h"
namespace chromeos {
@@ -43,9 +43,11 @@ void ManagerPasswordService::Init(
SupervisedUserManager* supervised_user_manager =
user_manager->GetSupervisedUserManager();
- const UserList& users = user_manager->GetUsers();
+ const user_manager::UserList& users = user_manager->GetUsers();
- for (UserList::const_iterator it = users.begin(); it != users.end(); ++it) {
+ for (user_manager::UserList::const_iterator it = users.begin();
+ it != users.end();
+ ++it) {
if ((*it)->GetType() != user_manager::USER_TYPE_SUPERVISED)
continue;
if (user_id != supervised_user_manager->GetManagerUserId((*it)->email()))
@@ -64,7 +66,7 @@ void ManagerPasswordService::OnSharedSettingsChange(
SupervisedUserManager* supervised_user_manager =
UserManager::Get()->GetSupervisedUserManager();
- const User* user = supervised_user_manager->FindBySyncId(su_id);
+ const user_manager::User* user = supervised_user_manager->FindBySyncId(su_id);
// No user on device.
if (user == NULL)
return;

Powered by Google App Engine
This is Rietveld 408576698