Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / chromeos / login / ui / webui_login_display.cc

diff --git a/src/chrome/browser/chromeos/login/ui/webui_login_display.cc b/src/chrome/browser/chromeos/login/ui/webui_login_display.cc
index d227fcd..ececc37 100644 (file)
--- a/src/chrome/browser/chromeos/login/ui/webui_login_display.cc
+++ b/src/chrome/browser/chromeos/login/ui/webui_login_display.cc
@@ -7,16 +7,19 @@
 #include "ash/shell.h"
 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
 #include "chrome/browser/chromeos/login/lock/screen_locker.h"
+#include "chrome/browser/chromeos/login/screens/chrome_user_selection_screen.h"
 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"
 #include "chrome/browser/chromeos/login/ui/user_adding_screen.h"
 #include "chrome/browser/chromeos/login/ui/webui_login_view.h"
 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser_window.h"
+#include "chrome/grit/chromium_strings.h"
+#include "chrome/grit/generated_resources.h"
 #include "chromeos/ime/ime_keyboard.h"
 #include "chromeos/ime/input_method_manager.h"
-#include "grit/chromium_strings.h"
-#include "grit/generated_resources.h"
+#include "chromeos/login/user_names.h"
+#include "components/user_manager/user_manager.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/views/widget/widget.h"
 #include "ui/wm/core/user_activity_detector.h"
@@ -42,7 +45,7 @@ WebUILoginDisplay::WebUILoginDisplay(LoginDisplay::Delegate* delegate)
       show_new_user_(false),
       webui_handler_(NULL),
       gaia_screen_(new GaiaScreen()),
-      user_selection_screen_(new UserSelectionScreen()) {
+      user_selection_screen_(new ChromeUserSelectionScreen()) {
 }
 
 void WebUILoginDisplay::ClearAndEnablePassword() {
@@ -50,7 +53,7 @@ void WebUILoginDisplay::ClearAndEnablePassword() {
       webui_handler_->ClearAndEnablePassword();
 }
 
-void WebUILoginDisplay::Init(const UserList& users,
+void WebUILoginDisplay::Init(const user_manager::UserList& users,
                              bool show_guest,
                              bool show_users,
                              bool show_new_user) {
@@ -80,7 +83,7 @@ void WebUILoginDisplay::OnUserRemoved(const std::string& username) {
   user_selection_screen_->OnUserRemoved(username);
 }
 
-void WebUILoginDisplay::OnUserImageChanged(const User& user) {
+void WebUILoginDisplay::OnUserImageChanged(const user_manager::User& user) {
   user_selection_screen_->OnUserImageChanged(user);
 }
 
@@ -88,7 +91,7 @@ void WebUILoginDisplay::HandleGetUsers() {
   user_selection_screen_->HandleGetUsers();
 }
 
-const UserList& WebUILoginDisplay::GetUsers() const {
+const user_manager::UserList& WebUILoginDisplay::GetUsers() const {
   return user_selection_screen_->GetUsers();
 }
 
@@ -120,7 +123,7 @@ void WebUILoginDisplay::SetUIEnabled(bool is_enabled) {
   // Allow this call only before user sign in or at lock screen.
   // If this call is made after new user signs in but login screen is still
   // around that would trigger a sign in extension refresh.
-  if (is_enabled && (!UserManager::Get()->IsUserLoggedIn() ||
+  if (is_enabled && (!user_manager::UserManager::Get()->IsUserLoggedIn() ||
                      ScreenLocker::default_screen_locker())) {
     ClearAndEnablePassword();
   }
@@ -247,28 +250,11 @@ void WebUILoginDisplay::CompleteLogin(const UserContext& user_context) {
     delegate_->CompleteLogin(user_context);
 }
 
-void WebUILoginDisplay::Login(const UserContext& user_context) {
+void WebUILoginDisplay::Login(const UserContext& user_context,
+                              const SigninSpecifics& specifics) {
   DCHECK(delegate_);
   if (delegate_)
-    delegate_->Login(user_context);
-}
-
-void WebUILoginDisplay::LoginAsRetailModeUser() {
-  DCHECK(delegate_);
-  if (delegate_)
-    delegate_->LoginAsRetailModeUser();
-}
-
-void WebUILoginDisplay::LoginAsGuest() {
-  DCHECK(delegate_);
-  if (delegate_)
-    delegate_->LoginAsGuest();
-}
-
-void WebUILoginDisplay::LoginAsPublicAccount(const std::string& username) {
-  DCHECK(delegate_);
-  if (delegate_)
-    delegate_->LoginAsPublicAccount(username);
+    delegate_->Login(user_context, specifics);
 }
 
 void WebUILoginDisplay::MigrateUserData(const std::string& old_password) {
@@ -282,7 +268,8 @@ void WebUILoginDisplay::LoadWallpaper(const std::string& username) {
 }
 
 void WebUILoginDisplay::LoadSigninWallpaper() {
-  WallpaperManager::Get()->SetDefaultWallpaperDelayed(UserManager::kSignInUser);
+  WallpaperManager::Get()->SetDefaultWallpaperDelayed(
+      chromeos::login::kSignInUser);
 }
 
 void WebUILoginDisplay::OnSigninScreenReady() {
@@ -291,7 +278,7 @@ void WebUILoginDisplay::OnSigninScreenReady() {
 }
 
 void WebUILoginDisplay::RemoveUser(const std::string& username) {
-  UserManager::Get()->RemoveUser(username, this);
+  user_manager::UserManager::Get()->RemoveUser(username, this);
 }
 
 void WebUILoginDisplay::ResyncUserData() {
@@ -359,11 +346,6 @@ void WebUILoginDisplay::Signout() {
   delegate_->Signout();
 }
 
-void WebUILoginDisplay::LoginAsKioskApp(const std::string& app_id,
-                                        bool diagnostic_mode) {
-  delegate_->LoginAsKioskApp(app_id, diagnostic_mode);
-}
-
 void WebUILoginDisplay::OnUserActivity(const ui::Event* event) {
   if (delegate_)
     delegate_->ResetPublicSessionAutoLoginTimer();