Index: ash/system/power/tablet_power_button_controller.cc |
diff --git a/ash/system/power/tablet_power_button_controller.cc b/ash/system/power/tablet_power_button_controller.cc |
index 4beeb3e4c26ae88b9ab83dba45320895564a63f0..0f8dea7789afd3a23fe1969591199d46d012e9d3 100644 |
--- a/ash/system/power/tablet_power_button_controller.cc |
+++ b/ash/system/power/tablet_power_button_controller.cc |
@@ -159,6 +159,9 @@ void TabletPowerButtonController::BrightnessChanged(int level, |
void TabletPowerButtonController::SuspendDone( |
const base::TimeDelta& sleep_duration) { |
last_resume_time_ = tick_clock_->NowTicks(); |
+ // Stop forcing backlights off on resume to handle situations where the power |
+ // button resumed but we didn't receive the event (crbug.com/735291). |
+ SetDisplayForcedOff(false); |
} |
void TabletPowerButtonController::LidEventReceived( |