chromeos: Avoid shutdown for delayed power button events.

ash/system/chromeos/power/tablet_power_button_controller.cc

 // Copyright 2016 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/system/chromeos/power/tablet_power_button_controller.h"
 
 #include "ash/common/accessibility_delegate.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/shell_delegate.h"
 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
 #include "ash/common/wm_shell.h"
 #include "ash/shell.h"
 #include "ash/wm/lock_state_controller.h"
 #include "base/time/default_tick_clock.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "ui/events/devices/input_device_manager.h"
 #include "ui/events/devices/stylus_state.h"
 #include "ui/events/event.h"
 
 namespace ash {
 
 namespace {
 
 // Amount of time the power button must be held to start the pre-shutdown
-// animation when in tablet mode.
-constexpr int kShutdownTimeoutMs = 500;
+// animation when in tablet mode. This differs depending on whether the screen
+// is on or off when the power button is initially pressed.
+constexpr int kShutdownWhenScreenOnTimeoutMs = 500;
+// TODO(derat): This is currently set to a high value to work around delays in
+// powerd's reports of button-up events when the preceding button-down event
+// turns the display on. Set it to a lower value once powerd no longer blocks on
+// asking Chrome to turn the display on: http://crbug.com/685734
+constexpr int kShutdownWhenScreenOffTimeoutMs = 2000;
 
 // Amount of time since last SuspendDone() that power button event needs to be
 // ignored.
 constexpr int kIgnorePowerButtonAfterResumeMs = 2000;
 
 // Returns true if device is a convertible/tablet device, otherwise false.
 bool IsTabletModeSupported() {
   MaximizeModeController* maximize_mode_controller =
       WmShell::Get()->maximize_mode_controller();
   return maximize_mode_controller &&
@@ skipping 177 matching lines @@
           &TabletPowerButtonController::OnGotInitialBacklightsForcedOff,
           weak_ptr_factory_.GetWeakPtr()));
 }
 
 void TabletPowerButtonController::OnGotInitialBacklightsForcedOff(
     bool is_forced_off) {
   backlights_forced_off_ = is_forced_off;
 }
 
 void TabletPowerButtonController::StartShutdownTimer() {
-  shutdown_timer_.Start(FROM_HERE,
-                        base::TimeDelta::FromMilliseconds(kShutdownTimeoutMs),
-                        this, &TabletPowerButtonController::OnShutdownTimeout);
+  base::TimeDelta timeout = base::TimeDelta::FromMilliseconds(
+      screen_off_when_power_button_down_ ? kShutdownWhenScreenOffTimeoutMs
+                                         : kShutdownWhenScreenOnTimeoutMs);
+  shutdown_timer_.Start(FROM_HERE, timeout, this,
+                        &TabletPowerButtonController::OnShutdownTimeout);
 }
 
 void TabletPowerButtonController::OnShutdownTimeout() {
   controller_->StartShutdownAnimation();
 }
 
 void TabletPowerButtonController::LockScreenIfRequired() {
   SessionStateDelegate* session_state_delegate =
       WmShell::Get()->GetSessionStateDelegate();
   if (session_state_delegate->ShouldLockScreenAutomatically() &&
       session_state_delegate->CanLockScreen() &&
       !session_state_delegate->IsUserSessionBlocked() &&
       !controller_->LockRequested()) {
     session_state_delegate->LockScreen();
   }
 }
 
 }  // namespace ash