On resume perform a delayed call to SetDisplayPower()

ui/display/chromeos/display_configurator.h

Index: ui/display/chromeos/display_configurator.h
diff --git a/ui/display/chromeos/display_configurator.h b/ui/display/chromeos/display_configurator.h
index 67de12e9feaca2836f1c2c1a8ceefe502b7d02b4..b10635287da9e0c65b9a75d2d545f923d5cebedc 100644
--- a/ui/display/chromeos/display_configurator.h
+++ b/ui/display/chromeos/display_configurator.h
@@ -126,12 +126,12 @@ class DISPLAY_EXPORT DisplayConfigurator : public NativeDisplayObserver {
   };
 
   // Flags that can be passed to SetDisplayPower().
-  static const int kSetDisplayPowerNoFlags = 0;
+  static const int kSetDisplayPowerNoFlags;
   // Configure displays even if the passed-in state matches |power_state_|.
-  static const int kSetDisplayPowerForceProbe = 1 << 0;
+  static const int kSetDisplayPowerForceProbe;
   // Do not change the state if multiple displays are connected or if the
   // only connected display is external.
-  static const int kSetDisplayPowerOnlyIfSingleInternalDisplay = 1 << 1;
+  static const int kSetDisplayPowerOnlyIfSingleInternalDisplay;
 
   // Gap between screens so cursor at bottom of active display doesn't
   // partially appear on top of inactive display. Higher numbers guard
@@ -350,7 +350,7 @@ class DISPLAY_EXPORT DisplayConfigurator : public NativeDisplayObserver {
 
   // The timer to delay configuring displays. See also the comments in
   // Dispatch().

[Daniel Erat, 2014/08/12 22:00:49]

nit: is this mention of Dispatch() obsolete?

[dnicoara, 2014/08/13 13:28:49]

Updated comment.

-  scoped_ptr<base::OneShotTimer<DisplayConfigurator> > configure_timer_;
+  base::OneShotTimer<DisplayConfigurator> configure_timer_;
 
   // Id for next display protection client.
   ContentProtectionClientId next_display_protection_client_id_;