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

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

Issue 319273002: Revert 275550 "Revert 275046 "ChromeOS login webui refactoring: ..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 6 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
« no previous file with comments | « no previous file | trunk/src/chrome/browser/chromeos/login/kiosk_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/chrome/browser/chromeos/login/app_launch_signin_screen.cc
===================================================================
--- trunk/src/chrome/browser/chromeos/login/app_launch_signin_screen.cc (revision 275554)
+++ trunk/src/chrome/browser/chromeos/login/app_launch_signin_screen.cc (working copy)
@@ -7,6 +7,8 @@
#include "base/values.h"
#include "chrome/browser/chromeos/login/help_app_launcher.h"
#include "chrome/browser/chromeos/login/login_utils.h"
+#include "chrome/browser/chromeos/login/screens/user_selection_screen.h"
+#include "chrome/browser/signin/screenlock_bridge.h"
#include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/web_ui.h"
@@ -151,6 +153,9 @@
}
const UserList& AppLaunchSigninScreen::GetUsers() const {
+ if (test_user_manager_) {
+ return test_user_manager_->GetUsers();
+ }
return owner_user_list_;
}
@@ -162,10 +167,6 @@
return true;
}
-bool AppLaunchSigninScreen::IsShowNewUser() const {
- return false;
-}
-
bool AppLaunchSigninScreen::IsSigninInProgress() const {
// Return true to suppress network processing in the signin screen.
return true;
@@ -202,4 +203,33 @@
delegate_->OnOwnerSigninSuccess();
}
+void AppLaunchSigninScreen::HandleGetUsers() {
+ base::ListValue users_list;
+ const UserList& users = GetUsers();
+
+ for (UserList::const_iterator it = users.begin(); it != users.end(); ++it) {
+ ScreenlockBridge::LockHandler::AuthType initial_auth_type =
+ UserSelectionScreen::ShouldForceOnlineSignIn(*it)
+ ? ScreenlockBridge::LockHandler::ONLINE_SIGN_IN
+ : ScreenlockBridge::LockHandler::OFFLINE_PASSWORD;
+ base::DictionaryValue* user_dict = new base::DictionaryValue();
+ UserSelectionScreen::FillUserDictionary(
+ *it, true, false, initial_auth_type, user_dict);
+ users_list.Append(user_dict);
+ }
+
+ webui_handler_->LoadUsers(users_list, false, false);
+}
+
+void AppLaunchSigninScreen::SetAuthType(
+ const std::string& username,
+ ScreenlockBridge::LockHandler::AuthType auth_type) {
+ return;
+}
+
+ScreenlockBridge::LockHandler::AuthType AppLaunchSigninScreen::GetAuthType(
+ const std::string& username) const {
+ return ScreenlockBridge::LockHandler::OFFLINE_PASSWORD;
+}
+
} // namespace chromeos
« no previous file with comments | « no previous file | trunk/src/chrome/browser/chromeos/login/kiosk_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698