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

Unified Diff: chrome/browser/chromeos/login/app_launch_signin_screen.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/app_launch_signin_screen.h
diff --git a/chrome/browser/chromeos/login/app_launch_signin_screen.h b/chrome/browser/chromeos/login/app_launch_signin_screen.h
index da9c8607e53d2a86e3e05c2456b66d6496eab947..2a89f044de254fb089766fcd2dc02231e89bf080 100644
--- a/chrome/browser/chromeos/login/app_launch_signin_screen.h
+++ b/chrome/browser/chromeos/login/app_launch_signin_screen.h
@@ -9,11 +9,11 @@
#include "base/memory/ref_counted.h"
#include "chrome/browser/chromeos/login/auth/authenticator.h"
-#include "chrome/browser/chromeos/login/users/user.h"
#include "chrome/browser/chromeos/login/users/user_manager.h"
#include "chrome/browser/signin/screenlock_bridge.h"
#include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
#include "chromeos/login/auth/auth_status_consumer.h"
+#include "components/user_manager/user.h"
namespace chromeos {
@@ -70,7 +70,7 @@ class AppLaunchSigninScreen : public SigninScreenHandlerDelegate,
LoginDisplayWebUIHandler* webui_handler) OVERRIDE;
virtual void ShowSigninScreenForCreds(const std::string& username,
const std::string& password);
- virtual const UserList& GetUsers() const OVERRIDE;
+ virtual const user_manager::UserList& GetUsers() const OVERRIDE;
virtual bool IsShowGuest() const OVERRIDE;
virtual bool IsShowUsers() const OVERRIDE;
virtual bool IsSigninInProgress() const OVERRIDE;
@@ -94,7 +94,7 @@ class AppLaunchSigninScreen : public SigninScreenHandlerDelegate,
scoped_refptr<Authenticator> authenticator_;
// This list should have at most one user, and that user should be the owner.
- UserList owner_user_list_;
+ user_manager::UserList owner_user_list_;
static UserManager* test_user_manager_;
« no previous file with comments | « chrome/browser/chromeos/first_run/first_run.cc ('k') | chrome/browser/chromeos/login/app_launch_signin_screen.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698