Revert of chromeos: Turn off displays on suspend

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 282 matching lines @@
                           const std::vector<GammaRampRGBEntry>& gamma_lut,
                           const std::vector<float>& correction_matrix);
 
  private:
   class DisplayLayoutManagerImpl;
 
   // Mapping a client to its protection request.
   typedef std::map<ContentProtectionClientId, ContentProtections>
       ProtectionRequests;
 
-  // Updates |pending_*| members and applies the passed-in state. |callback| is
-  // invoked (perhaps synchronously) on completion.
-  void SetDisplayPowerInternal(chromeos::DisplayPowerState power_state,
-                               int flags,
-                               const ConfigurationCallback& callback);
-
   // 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 NotifyDisplayStateObservers(bool success,
                                    MultipleDisplayState attempted_state);
 
   // Notifies observers about a power state change.
   void NotifyPowerStateObservers();
 
   // Returns the display state that should be used with |cached_displays_| while
   // in |power_state|.
   MultipleDisplayState ChooseDisplayState(
@@ skipping 67 matching lines @@
 
   // Pending requests. These values are used when triggering the next display
   // configuration.
   //
   // Stores the user requested state or INVALID if nothing was requested.
   MultipleDisplayState requested_display_state_;
 
   // Stores the requested power state.
   chromeos::DisplayPowerState requested_power_state_;
 
-  // The power state used by RunPendingConfiguration(). May be
-  // |requested_power_state_| or DISPLAY_POWER_ALL_OFF for suspend.
-  chromeos::DisplayPowerState pending_power_state_;
-
-  // True if |pending_power_state_| has been changed.
-  bool has_pending_power_state_;
+  // True if |requested_power_state_| has been changed due to a user request.
+  bool requested_power_state_change_;
 
   // Bitwise-or value of the |kSetDisplayPower*| flags defined above.
-  int pending_power_flags_;
+  int requested_power_flags_;
 
   // List of callbacks from callers waiting for the display configuration to
   // start/finish. Note these callbacks belong to the pending request, not a
   // request currently active.
   std::vector<ConfigurationCallback> queued_configuration_callbacks_;
 
   // List of callbacks belonging to the currently running display configuration
   // task.
   std::vector<ConfigurationCallback> in_progress_configuration_callbacks_;
 
@@ skipping 46 matching lines @@
 
   // This must be the last variable.
   base::WeakPtrFactory<DisplayConfigurator> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DisplayConfigurator);
 };
 
 }  // namespace ui
 
 #endif  // UI_DISPLAY_CHROMEOS_DISPLAY_CONFIGURATOR_H_