Made possible to lock and unlock with several logged in users.

chrome/browser/chromeos/login/webui_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/webui_screen_locker.h"
 
 #include "ash/shell.h"
 #include "ash/wm/session_state_controller.h"
 #include "ash/wm/session_state_observer.h"
 #include "base/command_line.h"
@@ skipping 36 matching lines @@
 WebUIScreenLocker::WebUIScreenLocker(ScreenLocker* screen_locker)
     : ScreenLockerDelegate(screen_locker),
       lock_ready_(false),
       webui_ready_(false),
       weak_factory_(this) {
   set_should_emit_login_prompt_visible(false);
   ash::Shell::GetInstance()->session_state_controller()->AddObserver(this);
   DBusThreadManager::Get()->GetPowerManagerClient()->AddObserver(this);
 }
 
-void WebUIScreenLocker::LockScreen(bool unlock_on_input) {
+void WebUIScreenLocker::LockScreen() {
   gfx::Rect bounds(ash::Shell::GetScreen()->GetPrimaryDisplay().bounds());
 
   lock_time_ = base::TimeTicks::Now();
   LockWindow* lock_window = LockWindow::Create();
   lock_window->set_observer(this);
   lock_window_ = lock_window->GetWidget();
   lock_window_->AddObserver(this);
   WebUILoginView::Init(lock_window_);
   lock_window_->SetContentsView(this);
   lock_window_->Show();
   OnWindowCreated();
   LoadURL(GURL(kLoginURL));
   lock_window->Grab();
 
   // Subscribe to crash events.
   content::WebContentsObserver::Observe(GetWebContents());
 
-  // User list consisting of a single logged-in user.
-  UserList users(1, chromeos::UserManager::Get()->GetLoggedInUser());
   login_display_.reset(new WebUILoginDisplay(this));
   login_display_->set_background_bounds(bounds);
   login_display_->set_parent_window(GetNativeWindow());
-  login_display_->Init(users, false, true, false);
+  login_display_->Init(screen_locker()->users(), false, true, false);
 
   static_cast<OobeUI*>(GetWebUI()->GetController())->ShowSigninScreen(
       login_display_.get(), login_display_.get());
 
   registrar_.Add(this,
                  chrome::NOTIFICATION_LOGIN_USER_IMAGE_CHANGED,
                  content::NotificationService::AllSources());
   registrar_.Add(this,
                  chrome::NOTIFICATION_LOCK_WEBUI_READY,
                  content::NotificationService::AllSources());
@@ skipping 113 matching lines @@
   return GetCurrentNetworkName();
 }
 
 bool WebUIScreenLocker::IsSigninInProgress() const {
   // The way how screen locker is implemented right now there's no
   // GAIA sign in in progress in any case.
   return false;
 }
 
 void WebUIScreenLocker::Login(const UserContext& user_context) {
-  chromeos::ScreenLocker::default_screen_locker()->Authenticate(
-      ASCIIToUTF16(user_context.password));
+  chromeos::ScreenLocker::default_screen_locker()->Authenticate(user_context);
 }
 
 void WebUIScreenLocker::LoginAsRetailModeUser() {
   NOTREACHED();
 }
 
 void WebUIScreenLocker::LoginAsGuest() {
   NOTREACHED();
 }
 
@@ skipping 89 matching lines @@
 
 void WebUIScreenLocker::RenderViewGone(base::TerminationStatus status) {
   if (browser_shutdown::GetShutdownType() == browser_shutdown::NOT_VALID &&
       status != base::TERMINATION_STATUS_NORMAL_TERMINATION) {
     LOG(ERROR) << "Renderer crash on lock screen";
     Signout();
   }
 }
 
 }  // namespace chromeos