Added login screen mode for adding users into session.

chrome/browser/chromeos/login/screen_locker.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/screen_locker.h"
 
 #include <string>
 #include <vector>
 
 #include "ash/ash_switches.h"
 #include "ash/desktop_background/desktop_background_controller.h"
 #include "ash/shell.h"
 #include "ash/wm/session_state_controller.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/string_util.h"
 #include "base/timer.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/login/authenticator.h"
 #include "chrome/browser/chromeos/login/login_performer.h"
 #include "chrome/browser/chromeos/login/login_utils.h"
+#include "chrome/browser/chromeos/login/user_adding_screen.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/login/webui_screen_locker.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/signin/signin_manager.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 16 matching lines @@
 
 namespace {
 
 // Timeout for unlock animation guard - some animations may be required to run
 // on successful authentication before unlocking, but we want to be sure that
 // unlock happens even if animations are broken.
 const int kUnlockGuardTimeoutMs = 400;
 
 // Observer to start ScreenLocker when the screen lock
 class ScreenLockObserver : public chromeos::SessionManagerClient::Observer,
-                           public content::NotificationObserver {
+                           public content::NotificationObserver,
+                           public chromeos::UserAddingScreen::Observer {
  public:
   ScreenLockObserver() : session_started_(false) {
     registrar_.Add(this,
                    chrome::NOTIFICATION_LOGIN_USER_CHANGED,
                    content::NotificationService::AllSources());
     registrar_.Add(this,
                    chrome::NOTIFICATION_SESSION_STARTED,
                    content::NotificationService::AllSources());
   }
 
@@ skipping 16 matching lines @@
         break;
       }
 
       default:
         NOTREACHED();
     }
   }
 
   virtual void LockScreen() OVERRIDE {
     VLOG(1) << "Received LockScreen D-Bus signal from session manager";
+    if (chromeos::UserAddingScreen::Get()->IsRunning()) {
+      VLOG(1) << "Waiting for user adding screen to stop";
+      chromeos::UserAddingScreen::Get()->AddObserver(this);
+      chromeos::UserAddingScreen::Get()->Cancel();
+    }
     if (session_started_ &&
         chromeos::UserManager::Get()->CanCurrentUserLock()) {
       chromeos::ScreenLocker::Show();
     } else {
       // If the current user's session cannot be locked or the user has not
       // completed all sign-in steps yet, log out instead. The latter is done to
       // avoid complications with displaying the lock screen over the login
       // screen while remaining secure in the case the user walks away during
       // the sign-in steps. See crbug.com/112225 and crbug.com/110933.
       VLOG(1) << "Calling session manager's StopSession D-Bus method";
       chromeos::DBusThreadManager::Get()->
           GetSessionManagerClient()->StopSession();
     }
   }
 
   virtual void UnlockScreen() OVERRIDE {
     VLOG(1) << "Received UnlockScreen D-Bus signal from session manager";
     chromeos::ScreenLocker::Hide();
   }
 
+  virtual void OnUserAddingFinished() OVERRIDE {
+    chromeos::UserAddingScreen::Get()->RemoveObserver(this);
+    LockScreen();
+  }
+
  private:
   bool session_started_;
   content::NotificationRegistrar registrar_;
   std::string saved_previous_input_method_id_;
   std::string saved_current_input_method_id_;
   std::vector<std::string> saved_active_input_method_list_;
 
   DISALLOW_COPY_AND_ASSIGN(ScreenLockObserver);
 };
 
@@ skipping 300 matching lines @@
       content::Details<bool>(&state));
   VLOG(1) << "Calling session manager's HandleLockScreenShown D-Bus method";
   DBusThreadManager::Get()->GetSessionManagerClient()->NotifyLockScreenShown();
 }
 
 content::WebUI* ScreenLocker::GetAssociatedWebUI() {
   return delegate_->GetAssociatedWebUI();
 }
 
 }  // namespace chromeos