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

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

Issue 296823009: ChromeOS login webui refactoring: split user selection/gaia login screens. (Closed) Base URL: http://git.chromium.org/chromium/src.git@refactoring-1
Patch Set: Created 6 years, 7 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 5de4a6a6b00c396d4cf5df5a4ef23fdfb3cbefb4..94595fa0686dd76369e2ecaf65383269f8a10a4c 100644
--- a/chrome/browser/chromeos/login/app_launch_signin_screen.cc
+++ b/chrome/browser/chromeos/login/app_launch_signin_screen.cc
@@ -7,6 +7,7 @@
#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/chromeos/login/users/user.h"
#include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
#include "content/public/browser/browser_thread.h"
@@ -163,10 +164,6 @@ bool AppLaunchSigninScreen::IsShowUsers() const {
return true;
}
-bool AppLaunchSigninScreen::IsShowNewUser() const {
- return false;
-}
-
bool AppLaunchSigninScreen::IsSigninInProgress() const {
// Return true to suppress network processing in the signin screen.
return true;
@@ -203,4 +200,26 @@ void AppLaunchSigninScreen::OnLoginSuccess(const UserContext& user_context) {
delegate_->OnOwnerSigninSuccess();
}
+void AppLaunchSigninScreen::HandleCustomButtonClicked(
+ const std::string& user_id) {
+ NOTREACHED();
+}
+
+void AppLaunchSigninScreen::HandleGetUsers() {
+ base::ListValue users_list;
Nikita (slow) 2014/05/23 15:52:15 Why this screen should implement this? It should j
Denis Kuznetsov (DE-MUC) 2014/05/27 17:35:28 Because it uses user pods (with just one user).
+ const UserList& users = GetUsers();
+
+ for (UserList::const_iterator it = users.begin(); it != users.end(); ++it) {
+ LoginDisplay::AuthType initial_auth_type =
+ UserSelectionScreen::ShouldForceOnlineSignIn(*it)
+ ? LoginDisplay::ONLINE_SIGN_IN
+ : LoginDisplay::OFFLINE_PASSWORD;
+ base::DictionaryValue* user_dict = new base::DictionaryValue();
+ UserSelectionScreen::FillUserDictionary(
+ *it, true, false, initial_auth_type, user_dict);
+ }
+
+ webui_handler_->LoadUsers(users_list, false, false);
+}
+
} // namespace chromeos

Powered by Google App Engine
This is Rietveld 408576698