Added login screen mode for adding users into session.

chrome/browser/chromeos/login/login_display_host_impl.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/login_display_host_impl.h"
 
 #include <vector>
 
 #include "ash/ash_switches.h"
 #include "ash/desktop_background/desktop_background_controller.h"
@@ skipping 65 matching lines @@
 #include "ui/compositor/layer_animator.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/transform.h"
 #include "ui/views/focus/focus_manager.h"
 #include "ui/views/widget/widget.h"
 
 namespace {
 
 // URL which corresponds to the login WebUI.
-const char kLoginURL[] = "chrome://oobe/login";
+const char kLoginURL[] = "chrome://oobe/login#login";
 
 // URL which corresponds to the OOBE WebUI.
-const char kOobeURL[] = "chrome://oobe";
+const char kOobeURL[] = "chrome://oobe#login";
+
+// URL which corresponds to the user adding WebUI.
+const char kUserAddingURL[] = "chrome://oobe/login#user-adding";
 
 // Duration of sign-in transition animation.
 const int kLoginFadeoutTransitionDurationMs = 700;
 
 // Number of times we try to reload OOBE/login WebUI if it crashes.
 const int kCrashCountLimit = 5;
 
 // Whether to enable tnitializing WebUI in hidden state (see
 // |initialize_webui_hidden_|) by default.
 const bool kHiddenWebUIInitializationDefault = true;
@@ skipping 199 matching lines @@
 }
 
 views::Widget* LoginDisplayHostImpl::GetWidget() const {
   return login_window_;
 }
 
 void LoginDisplayHostImpl::BeforeSessionStart() {
   session_starting_ = true;
 }
 
-void LoginDisplayHostImpl::OnSessionStart() {
+void LoginDisplayHostImpl::Finalize() {
   DVLOG(1) << "Session starting";
   ash::Shell::GetInstance()->
       desktop_background_controller()->MoveDesktopToUnlockedContainer();
   if (wizard_controller_.get())
     wizard_controller_->OnSessionStart();
   g_browser_process->platform_part()->profile_helper()->ClearSigninProfile(
       base::Closure());
-  // Display host is deleted once animation is completed
-  // since sign in screen widget has to stay alive.
-  StartAnimation();
+  if (!IsRunningUserAdding()) {
+    // Display host is deleted once animation is completed
+    // since sign in screen widget has to stay alive.
+    StartAnimation();
+  }
   ShutdownDisplayHost(false);
 }
 
 void LoginDisplayHostImpl::OnCompleteLogin() {
   // Cancelling the |auto_enrollment_client_| now allows it to determine whether
   // its protocol finished before login was complete.
   if (auto_enrollment_client_.get())
     auto_enrollment_client_.release()->CancelAndDeleteSoon();
 }
 
@@ skipping 64 matching lines @@
 
   oobe_progress_bar_visible_ = !StartupUtils::IsDeviceRegistered();
   SetOobeProgressBarVisible(oobe_progress_bar_visible_);
   wizard_controller_->Init(first_screen_name, screen_parameters.Pass());
 }
 
 WizardController* LoginDisplayHostImpl::GetWizardController() {
   return wizard_controller_.get();
 }
 
+void LoginDisplayHostImpl::StartUserAdding(
+    const base::Closure& completion_callback) {
+  restore_path_ = RESTORE_USER_ADDING;
+  completion_callback_ = completion_callback;
+  if (waiting_for_wallpaper_load_ && !initialize_webui_hidden_) {

[Nikita (slow), 2013/05/28 11:34:22]

Please remove this as I think that is not needed for this type of UI. They only
guard boot animation.

[dzhioev (left Google), 2013/05/29 13:05:04]

Done.

+    LOG(INFO) << "Login WebUI >> user adding postponed";
+    return;
+  }
+  LOG(INFO) << "Login WebUI >> user adding";
+  if (!login_window_) {
+    LoadURL(GURL(kUserAddingURL));
+  }

[Nikita (slow), 2013/05/28 11:34:22]

nit: drop {}

[dzhioev (left Google), 2013/05/29 13:05:04]

Done.

+
+  // Lock container can be transparent after lock screen animation.
+  aura::Window* lock_container = ash::Shell::GetContainer(
+      ash::Shell::GetPrimaryRootWindow(),
+      ash::internal::kShellWindowId_LockScreenContainersContainer);
+  lock_container->layer()->SetOpacity(1.0);
+
+  ash::Shell::GetInstance()->
+      desktop_background_controller()->MoveDesktopToLockedContainer();
+
+  sign_in_controller_.reset();  // Only one controller in a time.
+  sign_in_controller_.reset(new chromeos::ExistingUserController(this));
+  SetOobeProgressBarVisible(oobe_progress_bar_visible_ = false);
+  SetStatusAreaVisible(true);
+  SetShutdownButtonEnabled(true);
+  sign_in_controller_->Init(
+      chromeos::UserManager::Get()->GetUsersAdmittedForMultiProfile());
+  CHECK(webui_login_display_);
+  GetOobeUI()->ShowSigninScreen(webui_login_display_, webui_login_display_);
+}
+
 void LoginDisplayHostImpl::StartSignInScreen() {
   restore_path_ = RESTORE_SIGN_IN;
   is_showing_login_ = true;
 
   if (waiting_for_wallpaper_load_ && !initialize_webui_hidden_) {
     LOG(INFO) << "Login WebUI >> sign in postponed";
     return;
   }
   LOG(INFO) << "Login WebUI >> sign in";
 
@@ skipping 171 matching lines @@
 
 void LoginDisplayHostImpl::ShutdownDisplayHost(bool post_quit_task) {
   if (shutting_down_)
     return;
 
   shutting_down_ = true;
   registrar_.RemoveAll();
   MessageLoop::current()->DeleteSoon(FROM_HERE, this);
   if (post_quit_task)
     MessageLoop::current()->Quit();
+
+  if (!completion_callback_.is_null()) {

[Nikita (slow), 2013/05/28 11:34:22]

nit: drop {}

[dzhioev (left Google), 2013/05/29 13:05:04]

Done.

+    completion_callback_.Run();
+  }
 }
 
 void LoginDisplayHostImpl::StartAnimation() {
   if (ash::Shell::GetContainer(
           ash::Shell::GetPrimaryRootWindow(),
           ash::internal::kShellWindowId_DesktopBackgroundContainer)->
           children().empty()) {
     // If there is no background window, don't perform any animation on the
     // default and background layer because there is nothing behind it.
     return;
@@ skipping 86 matching lines @@
   }
 
   switch (restore_path_) {
     case RESTORE_WIZARD:
       StartWizard(wizard_first_screen_name_,
                   wizard_screen_parameters_.Pass());
       break;
     case RESTORE_SIGN_IN:
       StartSignInScreen();
       break;
+    case RESTORE_USER_ADDING:
+      StartUserAdding(completion_callback_);
+      break;
     default:
       NOTREACHED();
       break;
   }
 }
 
 void LoginDisplayHostImpl::InitLoginWindowAndView() {
   if (login_window_)
     return;
 
@@ skipping 56 matching lines @@
     if (root) {
       root->SetProperty(ash::internal::kIgnoreSoloWindowFramePainterPolicy,
                         old_ignore_solo_window_frame_painter_policy_value_);
     }
   }
   login_window_->Close();
   login_window_ = NULL;
   login_view_ = NULL;
 }
 
+bool LoginDisplayHostImpl::IsRunningUserAdding() {
+  return restore_path_ == RESTORE_USER_ADDING;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // external
 
 // Declared in login_wizard.h so that others don't need to depend on our .h.
 // TODO(nkostylev): Split this into a smaller functions.
 void ShowLoginWizard(const std::string& first_screen_name,
                      const gfx::Size& size) {
   if (browser_shutdown::IsTryingToQuit())
     return;
 
@@ skipping 43 matching lines @@
     LoginState::Get()->SetLoggedInState(
         LoginState::LOGGED_IN_OOBE, LoginState::LOGGED_IN_USER_NONE);
   } else {
     LoginState::Get()->SetLoggedInState(
         LoginState::LOGGED_IN_NONE, LoginState::LOGGED_IN_USER_NONE);
   }
   bool show_login_screen =
       (first_screen_name.empty() && oobe_complete) ||
       first_screen_name == chromeos::WizardController::kLoginScreenName;
 
-  chromeos::LoginDisplayHost* display_host;
-  display_host = new chromeos::LoginDisplayHostImpl(screen_bounds);
+  chromeos::LoginDisplayHost* display_host =
+      new chromeos::LoginDisplayHostImpl(screen_bounds);
 
   if (show_login_screen) {
     // R11 > R12 migration fix. See http://crosbug.com/p/4898.
     // If user has manually changed locale during R11 OOBE, locale will be set.
     // On R12 > R12|R13 etc. this fix won't get activated since
     // OOBE process has set kApplicationLocale to non-default value.
     PrefService* prefs = g_browser_process->local_state();
     if (!prefs->HasPrefPath(prefs::kApplicationLocale)) {
       std::string locale = chromeos::StartupUtils::GetInitialLocale();
       prefs->SetString(prefs::kApplicationLocale, locale);
@@ skipping 67 matching lines @@
   VLOG(1) << "Initial time zone: " << timezone_name;
   // Apply locale customizations only once to preserve whatever locale
   // user has changed to during OOBE.
   if (!timezone_name.empty()) {
     chromeos::system::TimezoneSettings::GetInstance()->SetTimezoneFromID(
         UTF8ToUTF16(timezone_name));
   }
 }
 
 }  // namespace chromeos