chromeos: Add DisplayPowerServiceProvider.

chromeos/display/output_configurator.h

 // Copyright (c) 2012 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 CHROMEOS_DISPLAY_OUTPUT_CONFIGURATOR_H_
 #define CHROMEOS_DISPLAY_OUTPUT_CONFIGURATOR_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/event_types.h"
 #include "base/observer_list.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/timer.h"
 #include "chromeos/chromeos_export.h"
+#include "third_party/cros_system_api/dbus/service_constants.h"
 
 // Forward declarations for Xlib and Xrandr.
 // This is so unused X definitions don't pollute the namespace.
 typedef unsigned long XID;
 typedef XID Window;
 typedef XID RROutput;
 typedef XID RRCrtc;
 typedef XID RRMode;
 
 struct _XDisplay;
@@ skipping 52 matching lines @@
   void Stop();
 
   // Called when the user hits ctrl-F4 to request a display mode change.
   // This method should only return false if it was called in a single-head or
   // headless mode.
   bool CycleDisplayMode();
 
   // Called when powerd notifies us that some set of displays should be turned
   // on or off.  This requires enabling or disabling the CRTC associated with
   // the display(s) in question so that the low power state is engaged.
-  bool ScreenPowerSet(bool power_on, bool all_displays);
+  // If |force_probe| is true, the displays will be configured even if
+  // |power_state| matches |power_state_|.
+  bool SetDisplayPower(DisplayPowerState power_state, bool force_probe);
 
   // Force switching the display mode to |new_state|.  This method is used when
   // the user explicitly changes the display mode in the options UI.  Returns
   // false if it was called in a single-head or headless mode.
   bool SetDisplayMode(OutputState new_state);
 
   // Called when an RRNotify event is received.  The implementation is
   // interested in the cases of RRNotify events which correspond to output
   // add/remove events.  Note that Output add/remove events are sent in response
   // to our own reconfiguration operations so spurious events are common.
   // Spurious events will have no effect.
   virtual bool Dispatch(const base::NativeEvent& event) OVERRIDE;
 
   void AddObserver(Observer* observer);
   void RemoveObserver(Observer* observer);
 
   // Tells if the output specified by |name| is for internal display.
   static bool IsInternalOutputName(const std::string& name);
 
-  // Set all the displays into pre-suspend mode; usually this means configure
-  // them for their resume state. This allows faster resume on machines where
-  // display configuration is slow.
+  // Sets all the displays into pre-suspend mode; usually this means
+  // configure them for their resume state. This allows faster resume on
+  // machines where display configuration is slow.
   void SuspendDisplays();
 
+  // Reprobes displays to handle changes made while the system was
+  // suspended.
+  void ResumeDisplays();
+
  private:
   // Configure outputs.
   void ConfigureOutputs();
 
   // Fires OnDisplayModeChanged() event to the observers.
   void NotifyOnDisplayChanged();
 
   // Returns a vector filled with properties of the first two connected outputs
   // found on |display| and |screen|.
   std::vector<OutputSnapshot> GetDualOutputs(Display* display,
@@ skipping 25 matching lines @@
   // Searches for touchscreens among input devices,
   // and tries to match them up to screens in |outputs|.
   // |display| and |screen| are used to make X calls.
   // |outputs| is an array of detected screens.
   // If a touchscreen with same resolution as an output's native mode
   // is detected, its id will be stored in this output.
   void GetTouchscreens(Display* display,
                        XRRScreenResources* screen,
                        std::vector<OutputSnapshot>& outputs);
 
-  // Configures X to the state specified in |new_state|.
-  // |display|, |screen| and |window| are used to change X configuration.
-  // |new_state| is the state to enter.
-  // |outputs| contains information on the currently configured state,
-  // as well as how to apply the new state.
+  // Configures X to the state specified in |output_state| and
+  // |power_state|.  |display|, |screen| and |window| are used to change X
+  // configuration.  |outputs| contains information on the currently
+  // configured state, as well as how to apply the new state.
   bool EnterState(Display* display,
                   XRRScreenResources* screen,
                   Window window,
-                  OutputState new_state,
+                  OutputState output_state,
+                  DisplayPowerState power_state,
                   const std::vector<OutputSnapshot>& outputs);
 
   // Outputs UMA metrics of previous state (the state that is being left).
   // Updates |mirror_mode_preserved_aspect_| and |last_enter_state_time_|.
   void RecordPreviousStateUMA();
 
   // Tells if the output specified by |output_info| is for internal display.
   static bool IsInternalOutput(const XRROutputInfo* output_info);
 
   // Returns output's native mode, None if not found.
@@ skipping 14 matching lines @@
   int connected_output_count_;
 
   // The base of the event numbers used to represent XRandr events used in
   // decoding events regarding output add/remove.
   int xrandr_event_base_;
 
   // The display state as derived from the outputs observed in |output_cache_|.
   // This is used for rotating display modes.
   OutputState output_state_;
 
+  // The current power state as set via SetDisplayPower().
+  DisplayPowerState power_state_;
+
   ObserverList<Observer> observers_;
 
   // The timer to delay configuring outputs. See also the comments in
   // |Dispatch()|.
   scoped_ptr<base::OneShotTimer<OutputConfigurator> > configure_timer_;
 
   // Next 3 members are used for UMA of time spent in various states.
   // Indicates that current OutputSnapshot has aspect preserving mirror mode.
   bool mirror_mode_will_preserve_aspect_;
 
   // Indicates that last entered mirror mode preserved aspect.
   bool mirror_mode_preserved_aspect_;
 
   // Indicates the time at which |output_state_| was entered.
   base::TimeTicks last_enter_state_time_;
 
   DISALLOW_COPY_AND_ASSIGN(OutputConfigurator);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_DISPLAY_OUTPUT_CONFIGURATOR_H_