cros: Use SessionController for lock starting code

chrome/browser/chromeos/login/lock/webui_screen_locker.h

 // Copyright 2014 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 CHROME_BROWSER_CHROMEOS_LOGIN_LOCK_WEBUI_SCREEN_LOCKER_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_LOCK_WEBUI_SCREEN_LOCKER_H_
 
 #include <stdint.h>
 
 #include <memory>
 #include <string>
 
 #include "ash/wm/lock_state_observer.h"

[James Cook, 2017/04/19 23:13:12]

Is this still needed?

[xiyuan, 2017/04/20 18:23:59]

Nope. Removed.

 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/time/time.h"
 #include "chrome/browser/chromeos/login/signin_screen_controller.h"
 #include "chrome/browser/chromeos/login/signin_specifics.h"
 #include "chrome/browser/chromeos/login/ui/lock_window.h"
 #include "chrome/browser/chromeos/login/ui/login_display.h"
 #include "chrome/browser/chromeos/login/ui/webui_login_view.h"
 #include "chromeos/dbus/power_manager_client.h"
 #include "content/public/browser/web_contents_observer.h"
@@ skipping 14 matching lines @@
 class NetworkStateHelper;
 }
 
 namespace test {
 class WebUIScreenLockerTester;
 }
 
 // Displays a WebUI lock screen based on the Oobe account picker screen.
 class WebUIScreenLocker : public WebUILoginView,
                           public LoginDisplay::Delegate,
-                          public ash::LockStateObserver,
                           public views::WidgetObserver,
                           public PowerManagerClient::Observer,
                           public display::DisplayObserver,
                           public content::WebContentsObserver {
  public:
   // Request lock screen preload when the user is idle. Does nothing if
   // preloading is disabled or if the preload hueristics return false.
   static void RequestPreload();
 
   explicit WebUIScreenLocker(ScreenLocker* screen_locker);
@@ skipping 22 matching lines @@
   // Called when the webui lock screen is ready. This gets invoked by a
   // chrome.send from the embedded webui.
   void OnLockWebUIReady();
 
   // Called when webui lock screen wallpaper is loaded and displayed.
   void OnLockBackgroundDisplayed();
 
   // Called when the webui header bar becomes visible.
   void OnHeaderBarVisible();
 
+  // Called by ScreenLocker to notify that ash lock animation finishes.
+  void OnLockAnimationFinished();
+
  private:
   friend class test::WebUIScreenLockerTester;
 
   // Returns true if the lock screen should be preloaded.
   static bool ShouldPreloadLockScreen();
   // Helper function that creates and preloads a views::WebView.
   static std::unique_ptr<views::WebView> DoPreload(Profile* profile);
 
   // LoginDisplay::Delegate:
   void CancelPasswordChangedFlow() override;
@@ skipping 11 matching lines @@
   void OnStartKioskAutolaunchScreen() override;
   void ShowWrongHWIDScreen() override;
   void ResetAutoLoginTimer() override;
   void ResyncUserData() override;
   void SetDisplayEmail(const std::string& email) override;
   void SetDisplayAndGivenName(const std::string& display_name,
                               const std::string& given_name) override;
   void Signout() override;
   bool IsUserWhitelisted(const AccountId& account_id) override;
 
-  // LockStateObserver:
-  void OnLockStateEvent(ash::LockStateObserver::EventType event) override;
-
   // WidgetObserver:
   void OnWidgetDestroying(views::Widget* widget) override;
 
   // PowerManagerClient::Observer:
   void SuspendImminent() override;
   void SuspendDone(const base::TimeDelta& sleep_duration) override;
   void LidEventReceived(PowerManagerClient::LidState state,
                         const base::TimeTicks& time) override;
 
   // content::WebContentsObserver:
@@ skipping 47 matching lines @@
   std::unique_ptr<login::NetworkStateHelper> network_state_helper_;
 
   base::WeakPtrFactory<WebUIScreenLocker> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(WebUIScreenLocker);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_LOCK_WEBUI_SCREEN_LOCKER_H_