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

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

Issue 23449023: Add kiosk browser tests for network configuration. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 3 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.cc
diff --git a/chrome/browser/chromeos/login/app_launch_signin_screen.cc b/chrome/browser/chromeos/login/app_launch_signin_screen.cc
index d567a1034cf5cf16d61625bb44e0e0b7fc72a91d..0d4d6b6bcb4e9b0bbf81c9b4f2ba48e58d060a78 100644
--- a/chrome/browser/chromeos/login/app_launch_signin_screen.cc
+++ b/chrome/browser/chromeos/login/app_launch_signin_screen.cc
@@ -17,7 +17,8 @@ AppLaunchSigninScreen::AppLaunchSigninScreen(
OobeUI* oobe_ui, Delegate* delegate)
: oobe_ui_(oobe_ui),
delegate_(delegate),
- webui_handler_(NULL) {
+ webui_handler_(NULL),
+ user_manager_for_testing_(NULL) {
}
AppLaunchSigninScreen::~AppLaunchSigninScreen() {
@@ -30,7 +31,7 @@ void AppLaunchSigninScreen::Show() {
}
void AppLaunchSigninScreen::InitOwnerUserList() {
- UserManager* user_manager = UserManager::Get();
+ UserManager* user_manager = GetUserManager();
const std::string& owner_email = user_manager->GetOwnerEmail();
const UserList& all_users = user_manager->GetUsers();
@@ -46,6 +47,11 @@ void AppLaunchSigninScreen::InitOwnerUserList() {
}
}
+UserManager* AppLaunchSigninScreen::GetUserManager() {
+ return user_manager_for_testing_ ?
+ user_manager_for_testing_ : UserManager::Get();
+}
+
void AppLaunchSigninScreen::CancelPasswordChangedFlow() {
NOTREACHED();
}

Powered by Google App Engine
This is Rietveld 408576698