Removed old login screen from source.

chrome/browser/chromeos/login/wizard_controller.cc

 // Copyright (c) 2010 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/wizard_controller.h"
 
 #include <gdk/gdk.h>
 #include <signal.h>
 #include <sys/types.h>
 
@@ skipping 14 matching lines @@
 #include "chrome/browser/chromeos/input_method/input_method_util.h"
 #include "chrome/browser/chromeos/language_preferences.h"
 #include "chrome/browser/chromeos/login/account_screen.h"
 #include "chrome/browser/chromeos/login/apply_services_customization.h"
 #include "chrome/browser/chromeos/login/background_view.h"
 #include "chrome/browser/chromeos/login/eula_view.h"
 #include "chrome/browser/chromeos/login/existing_user_controller.h"
 #include "chrome/browser/chromeos/login/helper.h"
 #include "chrome/browser/chromeos/login/html_page_screen.h"
 #include "chrome/browser/chromeos/login/language_switch_menu.h"
-#include "chrome/browser/chromeos/login/login_screen.h"
 #include "chrome/browser/chromeos/login/login_utils.h"
 #include "chrome/browser/chromeos/login/network_screen.h"
 #include "chrome/browser/chromeos/login/registration_screen.h"
 #include "chrome/browser/chromeos/login/rounded_rect_painter.h"
 #include "chrome/browser/chromeos/login/update_screen.h"
 #include "chrome/browser/chromeos/login/user_image_screen.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/login/wizard_accessibility_helper.h"
 #include "chrome/browser/chromeos/wm_ipc.h"
 #include "chrome/browser/prefs/pref_service.h"
@@ skipping 296 matching lines @@
     GetUpdateScreen()->CancelUpdate();
   }
 }
 
 chromeos::NetworkScreen* WizardController::GetNetworkScreen() {
   if (!network_screen_.get())
     network_screen_.reset(new chromeos::NetworkScreen(this));
   return network_screen_.get();
 }
 
-chromeos::LoginScreen* WizardController::GetLoginScreen() {
-  if (!login_screen_.get())
-    login_screen_.reset(new chromeos::LoginScreen(this));
-  return login_screen_.get();
-}
-
 chromeos::AccountScreen* WizardController::GetAccountScreen() {
   if (!account_screen_.get())
     account_screen_.reset(new chromeos::AccountScreen(this));
   return account_screen_.get();
 }
 
 chromeos::UpdateScreen* WizardController::GetUpdateScreen() {
   if (!update_screen_.get()) {
     update_screen_.reset(new chromeos::UpdateScreen(this));
     update_screen_->SetMaximalCurtainTime(kMaximalCurtainTimeSec);
@@ skipping 43 matching lines @@
   background_view_->SetOobeProgress(chromeos::BackgroundView::SELECT_NETWORK);
 }
 
 chromeos::ExistingUserController* WizardController::ShowLoginScreen() {
   SetStatusAreaVisible(true);
   background_view_->SetOobeProgress(chromeos::BackgroundView::SIGNIN);
 
   // Initiate services customization.
   chromeos::ApplyServicesCustomization::StartIfNeeded();
 
-  // When run under automation test show plain login screen.
-  if (!is_test_mode_ &&
-      chromeos::CrosLibrary::Get()->EnsureLoaded() &&
-      CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kEnableLoginImages)) {
-    std::vector<chromeos::UserManager::User> users =
-        chromeos::UserManager::Get()->GetUsers();
-    // ExistingUserController deletes itself.
-    gfx::Rect screen_bounds;
-    background_widget_->GetBounds(&screen_bounds, true);
-    chromeos::ExistingUserController* controller =
-        new chromeos::ExistingUserController(users, screen_bounds);
-    controller->OwnBackground(background_widget_, background_view_);
-    controller->Init();
-    background_widget_ = NULL;
-    background_view_ = NULL;
+  std::vector<chromeos::UserManager::User> users;
+  if (chromeos::CrosLibrary::Get()->EnsureLoaded())
+    users = chromeos::UserManager::Get()->GetUsers();
 
-    MessageLoop::current()->DeleteSoon(FROM_HERE, this);
+  // ExistingUserController deletes itself.
+  gfx::Rect screen_bounds;
+  background_widget_->GetBounds(&screen_bounds, true);
+  chromeos::ExistingUserController* controller =
+      new chromeos::ExistingUserController(users, screen_bounds);
+  controller->OwnBackground(background_widget_, background_view_);
+  controller->Init();
+  background_widget_ = NULL;
+  background_view_ = NULL;
 
-    return controller;
-  }
+  MessageLoop::current()->DeleteSoon(FROM_HERE, this);
 
-  SetCurrentScreen(GetLoginScreen());
-  return NULL;
+  return controller;
 }
 
 void WizardController::ShowAccountScreen() {
   VLOG(1) << "Showing create account screen.";
   SetStatusAreaVisible(true);
   SetCurrentScreen(GetAccountScreen());
 }
 
 void WizardController::ShowUpdateScreen() {
   VLOG(1) << "Showing update screen.";
@@ skipping 81 matching lines @@
   local_state->RegisterBooleanPref(kEulaAccepted, false);
   // Check if the pref is already registered in case
   // Preferences::RegisterUserPrefs runs before this code in the future.
   if (local_state->FindPreference(prefs::kAccessibilityEnabled) == NULL) {
     local_state->RegisterBooleanPref(prefs::kAccessibilityEnabled, false);
   }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // WizardController, ExitHandlers:
-void WizardController::OnLoginSignInSelected() {
-  // Don't show user image screen in case of automated testing.
-  if (is_test_mode_) {
-    MessageLoop::current()->DeleteSoon(FROM_HERE, this);
-    return;
-  }
-  // Don't launch browser until we pass image screen.
-  chromeos::LoginUtils::Get()->EnableBrowserLaunch(false);
-  ShowUserImageScreen();
-}
-
-void WizardController::OnLoginGuestUser() {
-  // We're on the stack, so don't try and delete us now.
-  MessageLoop::current()->DeleteSoon(FROM_HERE, this);
-}
-
-void WizardController::OnLoginCreateAccount() {
-  ShowAccountScreen();
-}
-
 void WizardController::OnNetworkConnected() {
   if (is_official_build_) {
     if (!IsEulaAccepted()) {
       ShowEulaScreen();
     } else {
       // Possible cases:
       // 1. EULA was accepted, forced shutdown/reboot during update.
       // 2. EULA was accepted, planned reboot after update.
       // Make sure that device is up-to-date.
       InitiateOOBEUpdate();
@@ skipping 10 matching lines @@
 }
 
 void WizardController::OnAccountCreateBack() {
   chromeos::ExistingUserController* controller = ShowLoginScreen();
   if (controller)
     controller->SelectNewUser();
 }
 
 void WizardController::OnAccountCreated() {
   chromeos::ExistingUserController* controller = ShowLoginScreen();
   if (controller)

[Dmitry Polukhin, 2010/12/14 14:06:18]

It should be DCHECK now.

[whywhat, 2010/12/16 10:47:52]

Done.

     controller->LoginNewUser(username_, password_);
-  else
-    Login(username_, password_);
   // TODO(dpolukhin): clear password memory for real. Now it is not
   // a problem because we can't extract password from the form.
   password_.clear();
 }
 
 void WizardController::OnConnectionFailed() {
   // TODO(dpolukhin): show error message after login screen is displayed.
   ShowLoginScreen();
 }
 
@@ skipping 149 matching lines @@
   // to WizardController it happens after screen is shown.
   if (background_view_) {
     background_view_->SetStatusAreaVisible(visible);
   }
 }
 
 void WizardController::ShowFirstScreen(const std::string& first_screen_name) {
   if (first_screen_name == kNetworkScreenName) {
     ShowNetworkScreen();
   } else if (first_screen_name == kLoginScreenName) {
-    // This flag is passed if we're running under automation test.
-    is_test_mode_ = true;
     ShowLoginScreen();
   } else if (first_screen_name == kAccountScreenName) {
     ShowAccountScreen();
   } else if (first_screen_name == kUpdateScreenName) {
     InitiateOOBEUpdate();
   } else if (first_screen_name == kUserImageScreenName) {
     ShowUserImageScreen();
   } else if (first_screen_name == kEulaScreenName) {
     ShowEulaScreen();
   } else if (first_screen_name == kRegistrationScreenName) {
     if (is_official_build_) {
       ShowRegistrationScreen();
     } else {
       // Just proceed to image screen.
       OnRegistrationSuccess();
     }
   } else if (first_screen_name == kHTMLPageScreenName) {
     ShowHTMLPageScreen();
   } else if (first_screen_name != kTestNoScreenName) {
     if (is_out_of_box_) {
       ShowNetworkScreen();
     } else {
       ShowLoginScreen();
     }
   }
 }
 
-void WizardController::Login(const std::string& username,
-                             const std::string& password) {
-  chromeos::LoginScreen* login = GetLoginScreen();
-  if (username.empty())
-    return;
-  login->view()->SetUsername(username);
-
-  if (password.empty())
-    return;
-  login->view()->SetPassword(password);
-  login->view()->Login();
-}
-
 // static
 bool WizardController::IsEulaAccepted() {
   return g_browser_process->local_state()->GetBoolean(kEulaAccepted);
 }
 
 // static
 bool WizardController::IsOobeCompleted() {
   return g_browser_process->local_state()->GetBoolean(kOobeComplete);
 }
 
@@ skipping 33 matching lines @@
   DCHECK(oobe_flag_file != NULL) << kOobeCompleteFlagFilePath;
   if (oobe_flag_file != NULL)
     file_util::CloseFile(oobe_flag_file);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // WizardController, chromeos::ScreenObserver overrides:
 void WizardController::OnExit(ExitCodes exit_code) {
   LOG(INFO) << "Wizard screen exit code: " << exit_code;
   switch (exit_code) {
-    case LOGIN_SIGN_IN_SELECTED:
-      OnLoginSignInSelected();
-      break;
-    case LOGIN_GUEST_SELECTED:
-      OnLoginGuestUser();
-      break;
-    case LOGIN_CREATE_ACCOUNT:
-      OnLoginCreateAccount();
-      break;
     case NETWORK_CONNECTED:
       OnNetworkConnected();
       break;
     case NETWORK_OFFLINE:
       OnNetworkOffline();
       break;
     case ACCOUNT_CREATE_BACK:
       OnAccountCreateBack();
       break;
     case ACCOUNT_CREATED:
@@ skipping 75 matching lines @@
     chromeos::input_method::EnableInputMethods(
         locale, chromeos::input_method::kKeyboardLayoutsOnly,
         initial_input_method_id);
   }
 
   gfx::Rect screen_bounds(chromeos::CalculateScreenBounds(size));
 
   // Check whether we need to execute OOBE process.
   bool oobe_complete = WizardController::IsOobeCompleted();
 
   if (first_screen_name.empty() &&

[Dmitry Polukhin, 2010/12/14 14:06:18]

Also we need to check that first screen is login. Otherwise we will create
wizard controller that will try to show login screen and create login existing
user controller. Let's optimize this path here.

[whywhat, 2010/12/16 10:47:52]

Done.

       oobe_complete &&
-      chromeos::CrosLibrary::Get()->EnsureLoaded() &&
-      CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kEnableLoginImages)) {
+      chromeos::CrosLibrary::Get()->EnsureLoaded()) {
     std::vector<chromeos::UserManager::User> users =
         chromeos::UserManager::Get()->GetUsers();
 
     // Fix for users who updated device and thus never passed register screen.
-    // If we already have user we assume that it is not a second part of OOBE.
-    // See http://crosbug.com/6289
+    // If we already have users, we assume that it is not a second part of
+    // OOBE. See http://crosbug.com/6289
     if (!WizardController::IsDeviceRegistered() && !users.empty()) {
       VLOG(1) << "Mark device registered because there are remembered users: "
               << users.size();
       WizardController::MarkDeviceRegistered();
     }
 
     // ExistingUserController deletes itself.
     (new chromeos::ExistingUserController(users, screen_bounds))->Init();
 
     // Initiate services customization.
@@ skipping 47 matching lines @@
     // user has changed to during OOBE.
     if (!timezone_name.empty()) {
       icu::TimeZone* timezone = icu::TimeZone::createTimeZone(
           icu::UnicodeString::fromUTF8(timezone_name));
       chromeos::CrosLibrary::Get()->GetSystemLibrary()->SetTimezone(timezone);
     }
   }
 }
 
 }  // namespace browser