chromeos: Don't apply stale display power state after resume

ui/display/chromeos/display_configurator.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 "ui/display/chromeos/display_configurator.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 499 matching lines @@
 
   NotifyObservers(success, new_state);
   return success;
 }
 
 void DisplayConfigurator::OnConfigurationChanged() {
   // Configure displays with |kConfigureDelayMs| delay,
   // so that time-consuming ConfigureDisplays() won't be called multiple times.
   if (configure_timer_.IsRunning()) {
     // Note: when the timer is running it is possible that a different task
-    // (SetDisplayPower()) is scheduled. In these cases, prefer the already
-    // scheduled task to ConfigureDisplays() since ConfigureDisplays() performs
-    // only basic configuration while SetDisplayPower() will perform additional
+    // (RestoreRequestedPowerStateAfterResume()) is scheduled. In these cases,
+    // prefer the already scheduled task to ConfigureDisplays() since
+    // ConfigureDisplays() performs only basic configuration while
+    // RestoreRequestedPowerStateAfterResume() will perform additional
     // operations.
     configure_timer_.Reset();
   } else {
     configure_timer_.Start(
         FROM_HERE,
         base::TimeDelta::FromMilliseconds(kConfigureDelayMs),
         this,
         &DisplayConfigurator::ConfigureDisplays);
   }
 }
@@ skipping 17 matching lines @@
                     kSetDisplayPowerOnlyIfSingleInternalDisplay);
 
     // We need to make sure that the monitor configuration we just did actually
     // completes before we return, because otherwise the X message could be
     // racing with the HandleSuspendReadiness message.
     native_display_delegate_->SyncWithServer();
   }
 }
 
 void DisplayConfigurator::ResumeDisplays() {
-  // Force probing to ensure that we pick up any changes that were made
-  // while the system was suspended.
   configure_timer_.Start(
       FROM_HERE,
       base::TimeDelta::FromMilliseconds(kResumeDelayMs),
-      base::Bind(base::IgnoreResult(&DisplayConfigurator::SetDisplayPower),
-                 base::Unretained(this),
-                 requested_power_state_,
-                 kSetDisplayPowerForceProbe));
+      base::Bind(&DisplayConfigurator::RestoreRequestedPowerStateAfterResume,
+                 base::Unretained(this)));
 }
 
 void DisplayConfigurator::UpdateCachedDisplays() {
   std::vector<DisplaySnapshot*> snapshots =
       native_display_delegate_->GetDisplays();
 
   cached_displays_.clear();
   for (size_t i = 0; i < snapshots.size(); ++i) {
     DisplayState display_state;
     display_state.display = snapshots[i];
@@ skipping 139 matching lines @@
   UpdateCachedDisplays();
   const MultipleDisplayState new_state = ChooseDisplayState(
       requested_power_state_);
   const bool success = EnterStateOrFallBackToSoftwareMirroring(
       new_state, requested_power_state_);
   native_display_delegate_->UngrabServer();
 
   NotifyObservers(success, new_state);
 }
 
+void DisplayConfigurator::RestoreRequestedPowerStateAfterResume() {
+  // Force probing to ensure that we pick up any changes that were made while
+  // the system was suspended.
+  SetDisplayPower(requested_power_state_, kSetDisplayPowerForceProbe);
+}
+
 void DisplayConfigurator::NotifyObservers(
     bool success,
     MultipleDisplayState attempted_state) {
   if (success) {
     FOR_EACH_OBSERVER(
         Observer, observers_, OnDisplayModeChanged(cached_displays_));
   } else {
     FOR_EACH_OBSERVER(
         Observer, observers_, OnDisplayModeChangeFailed(attempted_state));
   }
@@ skipping 228 matching lines @@
         return state_controller_->GetStateForDisplayIds(display_ids);
       }
     }
     default:
       NOTREACHED();
   }
   return MULTIPLE_DISPLAY_STATE_INVALID;
 }
 
 }  // namespace ui