Revert 275492 "ChromeOS login webui refactoring : Simplify login..."

trunk/src/chrome/browser/chromeos/login/existing_user_controller.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/login/existing_user_controller.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 363 matching lines @@
 }
 
 base::string16 ExistingUserController::GetConnectedNetworkName() {
   return network_state_helper_->GetCurrentNetworkName();
 }
 
 bool ExistingUserController::IsSigninInProgress() const {
   return is_login_in_progress_;
 }
 
-void ExistingUserController::Login(const UserContext& user_context,
-                                   const SigninSpecifics& specifics) {
-  if (user_context.GetUserType() == User::USER_TYPE_GUEST) {
-    if (!specifics.guest_mode_url.empty()) {
-      guest_mode_url_ = GURL(specifics.guest_mode_url);
-      if (specifics.guest_mode_url_append_locale)
-        guest_mode_url_ = google_util::AppendGoogleLocaleParam(guest_mode_url_);
-    }
-    LoginAsGuest();
-    return;
-  } else if (user_context.GetUserType() == User::USER_TYPE_PUBLIC_ACCOUNT) {
-    LoginAsPublicAccount(user_context.GetUserID());
-    return;
-  } else if (user_context.GetUserType() == User::USER_TYPE_RETAIL_MODE) {
-    LoginAsRetailModeUser();
-    return;
-  } else if (user_context.GetUserType() == User::USER_TYPE_KIOSK_APP) {
-    LoginAsKioskApp(user_context.GetUserID(), specifics.kiosk_diagnostic_mode);
-    return;
-  }
-
+void ExistingUserController::Login(const UserContext& user_context) {
   if (!user_context.HasCredentials())
     return;
 
   // Stop the auto-login timer when attempting login.
   StopPublicSessionAutoLoginTimer();
 
   // Disable clicking on other windows.
   login_display_->SetUIEnabled(false);
 
   if (last_login_attempt_username_ != user_context.GetUserID()) {
@@ skipping 170 matching lines @@
 void ExistingUserController::LoginAsKioskApp(const std::string& app_id,
                                              bool diagnostic_mode) {
   host_->StartAppLaunch(app_id, diagnostic_mode);
 }
 
 void ExistingUserController::OnSigninScreenReady() {
   signin_screen_ready_ = true;
   StartPublicSessionAutoLoginTimer();
 }
 
+void ExistingUserController::OnUserSelected(const std::string& username) {
+  login_performer_.reset(NULL);
+  num_login_attempts_ = 0;
+}
+
 void ExistingUserController::OnStartEnterpriseEnrollment() {
   if (KioskAppManager::Get()->IsConsumerKioskDeviceWithAutoLaunch()) {
     LOG(WARNING) << "Enterprise enrollment is not available after kiosk auto "
                     "launch is set.";
     return;
   }
 
   DeviceSettingsService::Get()->GetOwnershipStatusAsync(
       base::Bind(&ExistingUserController::OnEnrollmentOwnershipCheckCompleted,
                  weak_factory_.GetWeakPtr()));
@@ skipping 523 matching lines @@
 }
 
 void ExistingUserController::SendAccessibilityAlert(
     const std::string& alert_text) {
   AccessibilityAlertInfo event(ProfileHelper::GetSigninProfile(), alert_text);
   SendControlAccessibilityNotification(
       ui::AX_EVENT_VALUE_CHANGED, &event);
 }
 
 }  // namespace chromeos