ash: Merge LoginStatus update code path

ash/wm/lock_state_controller.cc

 // Copyright 2013 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 "ash/wm/lock_state_controller.h"
 
 #include <algorithm>
 #include <string>
 #include <utility>
 
@@ skipping 48 matching lines @@
 static const int kTimeoutMultiplier = 1;
 #endif
 
 const int LockStateController::kLockFailTimeoutMs = 8000 * kTimeoutMultiplier;
 const int LockStateController::kLockToShutdownTimeoutMs = 150;
 const int LockStateController::kShutdownRequestDelayMs = 50;
 
 LockStateController::LockStateController(
     ShutdownController* shutdown_controller)
     : animator_(new SessionStateAnimatorImpl()),
-      login_status_(LoginStatus::NOT_LOGGED_IN),
       system_is_locked_(false),
       shutting_down_(false),
       shutdown_after_lock_(false),
       animating_lock_(false),
       can_cancel_lock_animation_(false),
       shutdown_controller_(shutdown_controller),
       weak_ptr_factory_(this) {
   DCHECK(shutdown_controller_);
   Shell::GetPrimaryRootWindow()->GetHost()->AddObserver(this);
 }
@@ skipping 104 matching lines @@
 void LockStateController::SetLockScreenDisplayedCallback(
     const base::Closure& callback) {
   lock_screen_displayed_callback_ = callback;
 }
 
 void LockStateController::OnHostCloseRequested(
     const aura::WindowTreeHost* host) {
   Shell::Get()->shell_delegate()->Exit();
 }
 
-void LockStateController::OnLoginStateChanged(LoginStatus status) {
-  if (status != LoginStatus::LOCKED)
-    login_status_ = status;
-  system_is_locked_ = (status == LoginStatus::LOCKED);
-}
-
 void LockStateController::OnAppTerminating() {
   // If we hear that Chrome is exiting but didn't request it ourselves, all we
   // can really hope for is that we'll have time to clear the screen.
   // This is also the case when the user signs off.
   if (!shutting_down_) {
     shutting_down_ = true;
     Shell* shell = Shell::GetInstance();
     if (shell->cursor_manager()) {
       shell->cursor_manager()->HideCursor();
       shell->cursor_manager()->LockCursor();
@@ skipping 349 matching lines @@
     SessionStateAnimator::AnimationSpeed speed,
     SessionStateAnimator::AnimationSequence* animation_sequence) {
   if (unlocked_properties_.get() && unlocked_properties_->wallpaper_is_hidden) {
     animation_sequence->StartAnimation(SessionStateAnimator::WALLPAPER,
                                        SessionStateAnimator::ANIMATION_FADE_OUT,
                                        speed);
   }
 }
 
 }  // namespace ash