mash: Make the power button shut the system down.

ash/wm/lock_state_controller.cc

 // 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.
 
 #include "ash/wm/lock_state_controller.h"
 
 #include <algorithm>
 #include <string>
 #include <utility>
 
@@ skipping 144 matching lines @@
   StartImmediatePreLockAnimation(false /* request_lock_on_completion */);
 }
 
 void LockStateController::RequestShutdown() {
   if (shutting_down_)
     return;
 
   shutting_down_ = true;
 
   Shell* shell = Shell::GetInstance();
-  shell->cursor_manager()->HideCursor();
-  shell->cursor_manager()->LockCursor();
+  if (shell->cursor_manager()) {

[James Cook, 2017/01/25 02:40:26]

optional: WDYT of calling !WmShell::Get()->IsRunningInMash() for these? It might
make it clearer that it's a mash vs. classic ash difference (i.e. under classic
ash you should always have a cursor_manager()). Alternately, maybe comment this
is a mash thing?

(Sorry I didn't notice this before.)

[Daniel Erat, 2017/01/25 05:22:21]

presumably we're going to have a ws-aware CursorManager at some point, right?
i'll go the comment route for now.

+    shell->cursor_manager()->HideCursor();
+    shell->cursor_manager()->LockCursor();
+  }
 
   animator_->StartAnimation(
       SessionStateAnimator::ROOT_CONTAINER,
       SessionStateAnimator::ANIMATION_GRAYSCALE_BRIGHTNESS,
       SessionStateAnimator::ANIMATION_SPEED_SHUTDOWN);
   StartRealShutdownTimer(true);
 }
 
 void LockStateController::OnLockScreenHide(
     base::Callback<void(void)>& callback) {
@@ skipping 16 matching lines @@
   system_is_locked_ = (status == LoginStatus::LOCKED);
 }
 
 void LockStateController::OnAppTerminating() {
   // If we hear that Chrome is exiting but didn't request it ourselves, all we
   // can really hope for is that we'll have time to clear the screen.
   // This is also the case when the user signs off.
   if (!shutting_down_) {
     shutting_down_ = true;
     Shell* shell = Shell::GetInstance();
-    shell->cursor_manager()->HideCursor();
-    shell->cursor_manager()->LockCursor();
+    if (shell->cursor_manager()) {
+      shell->cursor_manager()->HideCursor();
+      shell->cursor_manager()->LockCursor();
+    }
     animator_->StartAnimation(SessionStateAnimator::kAllNonRootContainersMask,
                               SessionStateAnimator::ANIMATION_HIDE_IMMEDIATELY,
                               SessionStateAnimator::ANIMATION_SPEED_IMMEDIATE);
   }
 }
 
 void LockStateController::OnLockStateChanged(bool locked) {
   DCHECK((lock_fail_timer_.IsRunning() && lock_duration_timer_ != nullptr) ||
          (!lock_fail_timer_.IsRunning() && lock_duration_timer_ == nullptr));
   VLOG(1) << "OnLockStateChanged called with locked: " << locked
@@ skipping 49 matching lines @@
       FROM_HERE,
       animator_->GetDuration(SessionStateAnimator::ANIMATION_SPEED_SHUTDOWN),
       this, &LockStateController::OnPreShutdownAnimationTimeout);
 }
 
 void LockStateController::OnPreShutdownAnimationTimeout() {
   VLOG(1) << "OnPreShutdownAnimationTimeout";
   shutting_down_ = true;
 
   Shell* shell = Shell::GetInstance();
-  shell->cursor_manager()->HideCursor();
+  if (shell->cursor_manager())
+    shell->cursor_manager()->HideCursor();
 
   StartRealShutdownTimer(false);
 }
 
 void LockStateController::StartRealShutdownTimer(bool with_animation_time) {
   base::TimeDelta duration =
       base::TimeDelta::FromMilliseconds(kShutdownRequestDelayMs);
   if (with_animation_time) {
     duration +=
         animator_->GetDuration(SessionStateAnimator::ANIMATION_SPEED_SHUTDOWN);
@@ skipping 15 matching lines @@
   VLOG(1) << "OnRealPowerTimeout";
   DCHECK(shutting_down_);
   WmShell::Get()->RecordUserMetricsAction(UMA_ACCEL_SHUT_DOWN_POWER_BUTTON);
   // Shut down or reboot based on device policy.
   shutdown_controller_->ShutDownOrReboot();
 }
 
 void LockStateController::StartCancellableShutdownAnimation() {
   Shell* shell = Shell::GetInstance();
   // Hide cursor, but let it reappear if the mouse moves.
-  shell->cursor_manager()->HideCursor();
+  if (shell->cursor_manager())
+    shell->cursor_manager()->HideCursor();
 
   animator_->StartAnimation(
       SessionStateAnimator::ROOT_CONTAINER,
       SessionStateAnimator::ANIMATION_GRAYSCALE_BRIGHTNESS,
       SessionStateAnimator::ANIMATION_SPEED_SHUTDOWN);
   StartPreShutdownAnimationTimer();
 }
 
 void LockStateController::StartImmediatePreLockAnimation(
     bool request_lock_on_completion) {
@@ skipping 230 matching lines @@
     SessionStateAnimator::AnimationSpeed speed,
     SessionStateAnimator::AnimationSequence* animation_sequence) {
   if (unlocked_properties_.get() && unlocked_properties_->wallpaper_is_hidden) {
     animation_sequence->StartAnimation(SessionStateAnimator::WALLPAPER,
                                        SessionStateAnimator::ANIMATION_FADE_OUT,
                                        speed);
   }
 }
 
 }  // namespace ash