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

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

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/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 665eddd025b44f3adc27a3c9e24445d4b268256c..2fbcf662a10d2083cb9e625a048666bed2aaafd7 100644
--- a/chrome/browser/chromeos/login/app_launch_signin_screen.h
+++ b/chrome/browser/chromeos/login/app_launch_signin_screen.h
@@ -8,12 +8,12 @@
#include <string>
#include "base/memory/ref_counted.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 "chromeos/login/auth/authenticator.h"
#include "components/user_manager/user.h"
+#include "components/user_manager/user_manager.h"
namespace chromeos {
@@ -43,11 +43,11 @@ class AppLaunchSigninScreen : public SigninScreenHandlerDelegate,
void Show();
- static void SetUserManagerForTesting(UserManager* user_manager);
+ static void SetUserManagerForTesting(user_manager::UserManager* user_manager);
private:
void InitOwnerUserList();
- UserManager* GetUserManager();
+ user_manager::UserManager* GetUserManager();
// SigninScreenHandlerDelegate implementation:
virtual void CancelPasswordChangedFlow() OVERRIDE;
@@ -96,7 +96,7 @@ class AppLaunchSigninScreen : public SigninScreenHandlerDelegate,
// This list should have at most one user, and that user should be the owner.
user_manager::UserList owner_user_list_;
- static UserManager* test_user_manager_;
+ static user_manager::UserManager* test_user_manager_;
DISALLOW_COPY_AND_ASSIGN(AppLaunchSigninScreen);
};
« no previous file with comments | « chrome/browser/chromeos/login/app_launch_controller.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