mash: Shell ref clean up for screen lock

chrome/browser/chromeos/login/lock/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/screen_locker.h"
 
 #include <string>
 #include <vector>
 
 #include "ash/shell.h"
@@ skipping 20 matching lines @@
 #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/session/user_session_manager.h"
 #include "chrome/browser/chromeos/login/supervised/supervised_user_authentication.h"
 #include "chrome/browser/chromeos/login/ui/user_adding_screen.h"
 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h"
 #include "chrome/browser/chromeos/login/users/supervised_user_manager.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/signin/easy_unlock_service.h"
 #include "chrome/browser/signin/signin_manager_factory.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/screenlock_icon_provider.h"
 #include "chrome/browser/ui/webui/chromeos/login/screenlock_icon_source.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/grit/browser_resources.h"
 #include "chrome/grit/generated_resources.h"
 #include "chromeos/audio/chromeos_sounds.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/session_manager_client.h"
 #include "chromeos/login/auth/authenticator.h"
@@ skipping 327 matching lines @@
   return nullptr;
 }
 
 void ScreenLocker::OnStartLockCallback(bool locked) {
   // Happens in tests that exit with a pending lock. In real lock failure,
   // ash::LockStateController would cause the current user session to be
   // terminated.
   if (!locked)
     return;
 
-  web_ui()->OnLockAnimationFinished();
+  web_ui()->OnAshLockAnimationFinished();
 
   AccessibilityManager::Get()->PlayEarcon(
       chromeos::SOUND_LOCK, PlaySoundOption::SPOKEN_FEEDBACK_ENABLED);
 }
 
 void ScreenLocker::ClearErrors() {
   web_ui()->ClearErrors();
 }
 
 void ScreenLocker::Signout() {
@@ skipping 67 matching lines @@
   base::RecordAction(UserMetricsAction("ScreenLocker_Show"));
   DCHECK(base::MessageLoopForUI::IsCurrent());
 
   // Check whether the currently logged in user is a guest account and if so,
   // refuse to lock the screen (crosbug.com/23764).
   if (user_manager::UserManager::Get()->IsLoggedInAsGuest()) {
     VLOG(1) << "Refusing to lock screen for guest account";
     return;
   }
 
-  // If the active window is fullscreen, exit fullscreen to avoid the web page
-  // or app mimicking the lock screen. Do not exit fullscreen if the shelf is
-  // visible while in fullscreen because the shelf makes it harder for a web
-  // page or app to mimick the lock screen.
-  ash::wm::WindowState* active_window_state = ash::wm::GetActiveWindowState();
-  if (active_window_state && active_window_state->IsFullscreen() &&
-      active_window_state->hide_shelf_when_fullscreen()) {
-    const ash::wm::WMEvent event(ash::wm::WM_EVENT_TOGGLE_FULLSCREEN);
-    active_window_state->OnWMEvent(&event);
+  // Manipulating active window state directly does not work in mash so skip it
+  // for mash. http://crbug.com/714677 tracks work to add the support for mash.
+  if (!ash_util::IsRunningInMash()) {
+    // If the active window is fullscreen, exit fullscreen to avoid the web page
+    // or app mimicking the lock screen. Do not exit fullscreen if the shelf is
+    // visible while in fullscreen because the shelf makes it harder for a web
+    // page or app to mimick the lock screen.
+    ash::wm::WindowState* active_window_state = ash::wm::GetActiveWindowState();
+    if (active_window_state && active_window_state->IsFullscreen() &&
+        active_window_state->hide_shelf_when_fullscreen()) {
+      const ash::wm::WMEvent event(ash::wm::WM_EVENT_TOGGLE_FULLSCREEN);
+      active_window_state->OnWMEvent(&event);
+    }
   }
 
   if (!screen_locker_) {
     ScreenLocker* locker =
         new ScreenLocker(user_manager::UserManager::Get()->GetUnlockUsers());
     VLOG(1) << "Created ScreenLocker " << locker;
     locker->Init();
   } else {
     VLOG(1) << "ScreenLocker " << screen_locker_ << " already exists; "
             << " calling session manager's HandleLockScreenShown D-Bus method";
@@ skipping 158 matching lines @@
     auth_status_consumer_->OnAuthFailure(failure);
   }
 }
 
 void ScreenLocker::OnEndCurrentAuthSession(bool success) {
   LOG_IF(ERROR, !success)
       << "Failed to end current fingerprint authentication session.";
 }
 
 }  // namespace chromeos