ash: Merge LoginStatus update code path

ash/wm/lock_state_controller.h

 // 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.
 
 #ifndef ASH_WM_LOCK_STATE_CONTROLLER_H_
 #define ASH_WM_LOCK_STATE_CONTROLLER_H_
 
 #include <memory>
 
 #include "ash/ash_export.h"
@@ skipping 104 matching lines @@
   void OnLockScreenHide(base::Closure& callback);
 
   // Sets up the callback that should be called once lock animation is finished.
   // Callback is guaranteed to be called once and then discarded.
   void SetLockScreenDisplayedCallback(const base::Closure& callback);
 
   // aura::WindowTreeHostObserver override:
   void OnHostCloseRequested(const aura::WindowTreeHost* host) override;
 
   // ShellObserver overrides:
-  void OnLoginStateChanged(LoginStatus status) override;
   void OnAppTerminating() override;
   void OnLockStateChanged(bool locked) override;
 
   void set_animator_for_test(SessionStateAnimator* animator) {
     animator_.reset(animator);
   }
 
  private:
   friend class test::LockStateControllerTest;
   friend class test::LockStateControllerTestApi;
@@ skipping 56 matching lines @@
       ash::SessionStateAnimator::AnimationSpeed speed,
       SessionStateAnimator::AnimationSequence* animation_sequence);
 
   // Fades out wallpaper layer with |speed| if it was hidden in unlocked state.
   void AnimateWallpaperHidingIfNecessary(
       ash::SessionStateAnimator::AnimationSpeed speed,
       SessionStateAnimator::AnimationSequence* animation_sequence);
 
   std::unique_ptr<SessionStateAnimator> animator_;
 
-  // The current login status, or original login status from before we locked.
-  LoginStatus login_status_;
-
   // Current lock status.
   bool system_is_locked_;
 
   // Are we in the process of shutting the machine down?
   bool shutting_down_;
 
   // Indicates whether controller should proceed to (cancellable) shutdown after
   // locking.
   bool shutdown_after_lock_;
 
@@ skipping 32 matching lines @@
   base::Closure lock_screen_displayed_callback_;
 
   base::WeakPtrFactory<LockStateController> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(LockStateController);
 };
 
 }  // namespace ash
 
 #endif  // ASH_WM_LOCK_STATE_CONTROLLER_H_