cros: Use SessionController for lock starting code

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

 // 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.
 
 #include "chrome/browser/chromeos/login/lock/webui_screen_locker.h"
 
 #include "ash/shell.h"
-#include "ash/shell_port.h"
 #include "ash/system/power/power_event_observer.h"
 #include "base/command_line.h"
 #include "base/feature_list.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_shutdown.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/accessibility/accessibility_util.h"
 #include "chrome/browser/chromeos/login/helper.h"
@@ skipping 98 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // WebUIScreenLocker implementation.
 
 WebUIScreenLocker::WebUIScreenLocker(ScreenLocker* screen_locker)
     : WebUILoginView(BuildConfigSettings()),
       screen_locker_(screen_locker),
       network_state_helper_(new login::NetworkStateHelper),
       weak_factory_(this) {
   set_should_emit_login_prompt_visible(false);
-  ash::ShellPort::Get()->AddLockStateObserver(this);
   display::Screen::GetScreen()->AddObserver(this);
   DBusThreadManager::Get()->GetPowerManagerClient()->AddObserver(this);
 }
 
 WebUIScreenLocker::~WebUIScreenLocker() {
   DBusThreadManager::Get()->GetPowerManagerClient()->RemoveObserver(this);
   display::Screen::GetScreen()->RemoveObserver(this);
-  ash::ShellPort::Get()->RemoveLockStateObserver(this);
   // In case of shutdown, lock_window_ may be deleted before WebUIScreenLocker.
   if (lock_window_) {
     lock_window_->RemoveObserver(this);
     lock_window_->Close();
   }
   // If LockScreen() was called, we need to clear the signin screen handler
   // delegate set in ShowSigninScreen so that it no longer points to us.
   if (login_display_.get() && GetOobeUI())
     GetOobeUI()->ResetSigninScreenHandlerDelegate();
 
@@ skipping 108 matching lines @@
   UMA_HISTOGRAM_TIMES("LockScreen.BackgroundReady",
                       base::TimeTicks::Now() - lock_time_);
 }
 
 void WebUIScreenLocker::OnHeaderBarVisible() {
   DCHECK(ash::Shell::HasInstance());
 
   ash::Shell::Get()->power_event_observer()->OnLockAnimationsComplete();
 }
 
+void WebUIScreenLocker::OnLockAnimationFinished() {
+  // Release capture if any.
+  aura::client::GetCaptureClient(GetNativeWindow()->GetRootWindow())
+      ->SetCapture(NULL);

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

nit: nullptr

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

Done.

+  GetWebUI()->CallJavascriptFunctionUnsafe(
+      "cr.ui.Oobe.animateOnceFullyDisplayed");
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // WebUIScreenLocker, LoginDisplay::Delegate:
 
 void WebUIScreenLocker::CancelPasswordChangedFlow()  {
   NOTREACHED();
 }
 
 void WebUIScreenLocker::CompleteLogin(const UserContext& user_context) {
   NOTREACHED();
 }
@@ skipping 63 matching lines @@
 void WebUIScreenLocker::Signout() {
   chromeos::ScreenLocker::default_screen_locker()->Signout();
 }
 
 bool WebUIScreenLocker::IsUserWhitelisted(const AccountId& account_id) {
   NOTREACHED();
   return true;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// SessionLockStateObserver:
-
-void WebUIScreenLocker::OnLockStateEvent(
-    ash::LockStateObserver::EventType event) {
-  if (event == ash::LockStateObserver::EVENT_LOCK_ANIMATION_FINISHED) {
-    // Release capture if any.
-    aura::client::GetCaptureClient(GetNativeWindow()->GetRootWindow())->
-        SetCapture(NULL);
-    GetWebUI()->CallJavascriptFunctionUnsafe(
-        "cr.ui.Oobe.animateOnceFullyDisplayed");
-  }
-}
-
-////////////////////////////////////////////////////////////////////////////////
 // WidgetObserver:
 
 void WebUIScreenLocker::OnWidgetDestroying(views::Widget* widget) {
   lock_window_->RemoveObserver(this);
   lock_window_ = NULL;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // PowerManagerClient::Observer:
 
@@ skipping 46 matching lines @@
   }
 
   if (GetOobeUI()) {
     const gfx::Size& size = primary_display.size();
     GetOobeUI()->GetCoreOobeView()->SetClientAreaSize(size.width(),
                                                       size.height());
   }
 }
 
 }  // namespace chromeos