chromeos: Include mode details in OutputSnapshot.

chromeos/display/real_output_configurator_delegate.h

Index: chromeos/display/real_output_configurator_delegate.h
diff --git a/chromeos/display/real_output_configurator_delegate.h b/chromeos/display/real_output_configurator_delegate.h
index 9f083cf59bb338f5e6f08740dedf12378dfbef24..70e6df4c77cce94f4b043786407d2c094ff88acd 100644
--- a/chromeos/display/real_output_configurator_delegate.h
+++ b/chromeos/display/real_output_configurator_delegate.h
@@ -39,11 +39,6 @@ class RealOutputConfiguratorDelegate : public OutputConfigurator::Delegate {
   virtual void ForceDPMSOn() OVERRIDE;
   virtual std::vector<OutputConfigurator::OutputSnapshot> GetOutputs(
       const OutputConfigurator::StateController* state_controller) OVERRIDE;
-  virtual bool GetModeDetails(
-      RRMode mode,
-      int* width,
-      int* height,
-      bool* interlaced) OVERRIDE;
   virtual bool ConfigureCrtc(
       RRCrtc crtc,
       RRMode mode,
@@ -60,6 +55,20 @@ class RealOutputConfiguratorDelegate : public OutputConfigurator::Delegate {
   virtual void SendProjectingStateToPowerManager(bool projecting) OVERRIDE;
 
  private:
+  // Gets details corresponding to |mode|. Parameters may be NULL. Returns
+  // true on success.
+  bool GetModeDetails(RRMode mode, int* width, int* height, bool* interlaced);
+
+  // Helper method for GetOutputs() that returns an OutputSnapshot struct based
+  // on the passed-in information. Further initialization is required (e.g.
+  // |mirror_mode| and |touch_device_id|).
+  OutputConfigurator::OutputSnapshot InitOutputSnapshot(
+      RROutput id,
+      XRROutputInfo* info,
+      RRCrtc* last_used_crtc,
+      int index,
+      const OutputConfigurator::StateController* state_controller);
+
   // Destroys unused CRTCs and parks used CRTCs in a way which allows a
   // framebuffer resize. This is faster than turning them off, resizing,
   // then turning them back on.