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

Unified Diff: chrome/browser/chromeos/login/existing_user_controller.h

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/chromeos/login/existing_user_controller.h
diff --git a/chrome/browser/chromeos/login/existing_user_controller.h b/chrome/browser/chromeos/login/existing_user_controller.h
index d36764de1b4384fabacd28636d62ccee89a78955..ed8cb7ec7b7527edfc41b7fa94e3a21ebddcc79f 100644
--- a/chrome/browser/chromeos/login/existing_user_controller.h
+++ b/chrome/browser/chromeos/login/existing_user_controller.h
@@ -20,9 +20,9 @@
#include "chrome/browser/chromeos/login/auth/login_performer.h"
#include "chrome/browser/chromeos/login/login_utils.h"
#include "chrome/browser/chromeos/login/ui/login_display.h"
-#include "chrome/browser/chromeos/login/users/user.h"
#include "chrome/browser/chromeos/settings/cros_settings.h"
#include "chrome/browser/chromeos/settings/device_settings_service.h"
+#include "components/user_manager/user.h"
#include "content/public/browser/notification_observer.h"
#include "content/public/browser/notification_registrar.h"
#include "ui/gfx/rect.h"
@@ -60,7 +60,7 @@ class ExistingUserController : public LoginDisplay::Delegate,
}
// Creates and shows login UI for known users.
- void Init(const UserList& users);
+ void Init(const user_manager::UserList& users);
// Tells the controller to enter the Enterprise Enrollment screen when
// appropriate.
@@ -219,7 +219,7 @@ class ExistingUserController : public LoginDisplay::Delegate,
}
// Updates the |login_display_| attached to this controller.
- void UpdateLoginDisplay(const UserList& users);
+ void UpdateLoginDisplay(const user_manager::UserList& users);
// Sends an accessibility alert event to extension listeners.
void SendAccessibilityAlert(const std::string& alert_text);
« no previous file with comments | « chrome/browser/chromeos/login/crash_restore_browsertest.cc ('k') | chrome/browser/chromeos/login/existing_user_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698