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

ui/display/chromeos/display_configurator.h

 // 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.
 
 #ifndef UI_DISPLAY_CHROMEOS_DISPLAY_CONFIGURATOR_H_
 #define UI_DISPLAY_CHROMEOS_DISPLAY_CONFIGURATOR_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 249 matching lines @@
   // |internal_display| instead of only searching for a matching mode (note that
   // it may lead to a crash if |internal_info| is not capable of panel fitting).
   //
   // |preserve_aspect| limits the search/creation only to the modes having the
   // native aspect ratio of |external_display|.
   bool FindMirrorMode(DisplayState* internal_display,
                       DisplayState* external_display,
                       bool try_panel_fitting,
                       bool preserve_aspect);
 
-  // Configures displays.
+  // Configures displays. Invoked by |configure_timer_|.
   void ConfigureDisplays();
 
+  // Restores |requested_power_state_| after the system has resumed,
+  // additionally forcing a probe. Invoked by |configure_timer_|.
+  void RestoreRequestedPowerStateAfterResume();
+
   // Notifies observers about an attempted state change.
   void NotifyObservers(bool success, MultipleDisplayState attempted_state);
 
   // Switches to the state specified in |display_state| and |power_state|.
   // If the hardware mirroring failed and |mirroring_controller_| is set,
   // it switches to |STATE_DUAL_EXTENDED| and calls |SetSoftwareMirroring()|
   // to enable software based mirroring.
   // On success, updates |display_state_|, |power_state_|, and
   // |cached_displays_| and returns true.
   bool EnterStateOrFallBackToSoftwareMirroring(
@@ skipping 62 matching lines @@
 
   // Display protection requests of each client.
   ProtectionRequests client_protection_requests_;
 
   DISALLOW_COPY_AND_ASSIGN(DisplayConfigurator);
 };
 
 }  // namespace ui
 
 #endif  // UI_DISPLAY_CHROMEOS_DISPLAY_CONFIGURATOR_H_