mash: Shell ref clean up for screen lock

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/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"
 #include "chrome/browser/chromeos/login/lock/screen_locker.h"
 #include "chrome/browser/chromeos/login/quick_unlock/quick_unlock_factory.h"
 #include "chrome/browser/chromeos/login/quick_unlock/quick_unlock_storage.h"
 #include "chrome/browser/chromeos/login/ui/preloaded_web_view.h"
 #include "chrome/browser/chromeos/login/ui/preloaded_web_view_factory.h"
 #include "chrome/browser/chromeos/login/ui/webui_login_display.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/ui/ash/ash_util.h"
+#include "chrome/browser/ui/ash/session_controller_client.h"
 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
 #include "chrome/common/chrome_features.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/generated_resources.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "components/login/base_screen_handler_utils.h"
 #include "components/prefs/pref_service.h"
 #include "components/user_manager/user.h"
@@ skipping 213 matching lines @@
   if (lock_ready_)
     ScreenLockReady();
 }
 
 void WebUIScreenLocker::OnLockBackgroundDisplayed() {
   UMA_HISTOGRAM_TIMES("LockScreen.BackgroundReady",
                       base::TimeTicks::Now() - lock_time_);
 }
 
 void WebUIScreenLocker::OnHeaderBarVisible() {
-  DCHECK(ash::Shell::HasInstance());
-
-  ash::Shell::Get()->power_event_observer()->OnLockAnimationsComplete();
+  SessionControllerClient::Get()->NotifyChromeLockAnimationsComplete();
 }
 
-void WebUIScreenLocker::OnLockAnimationFinished() {
+void WebUIScreenLocker::OnAshLockAnimationFinished() {
   // Release capture if any.
   aura::client::GetCaptureClient(GetNativeWindow()->GetRootWindow())
       ->SetCapture(nullptr);
   GetWebUI()->CallJavascriptFunctionUnsafe(
       "cr.ui.Oobe.animateOnceFullyDisplayed");
 }
 
 void WebUIScreenLocker::SetFingerprintState(const AccountId& account_id,
                                             FingerprintState state) {
   // TODO(xiaoyinh@): Modify JS side to consolidate removeUserPodFingerprintIcon
@@ skipping 159 matching lines @@
   }
 
   if (GetOobeUI()) {
     const gfx::Size& size = primary_display.size();
     GetOobeUI()->GetCoreOobeView()->SetClientAreaSize(size.width(),
                                                       size.height());
   }
 }
 
 }  // namespace chromeos