Add ability to set resolution on external display

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 <map>
 #include <string>
 #include <vector>
@@ skipping 37 matching lines @@
 
     RROutput output;
 
     // CRTC that should be used for this output.  Not necessarily the CRTC
     // that XRandR reports is currently being used.
     RRCrtc crtc;
 
     RRMode current_mode;
     RRMode native_mode;
     RRMode mirror_mode;
+    RRMode selected_mode;
 
     int y;
     int height;
 
     bool is_internal;
     bool is_aspect_preserving_scaling;
 
     // XInput device ID or 0 if this output isn't a touchscreen.
     int touch_device_id;
 
@@ skipping 39 matching lines @@
 
   // Interface for classes that make decisions about which output state
   // should be used.
   class StateController {
    public:
     virtual ~StateController() {}
 
     // Called when displays are detected.
     virtual OutputState GetStateForDisplayIds(
         const std::vector<int64>& display_ids) const = 0;
+
+    // Queries the resolution (|width|x|height|) in pixels
+    // to select output mode for the given display id.
+    virtual bool GetResolutionForDisplayId(int64 display_id,
+                                           int* width,
+                                           int* height) const = 0;
   };
 
   // Interface for classes that implement software based mirroring.
   class SoftwareMirroringController {
    public:
     virtual ~SoftwareMirroringController() {}
 
     // Called when the hardware mirroring failed.
     virtual void SetSoftwareMirroring(bool enabled) = 0;
   };
@@ skipping 25 matching lines @@
     virtual void SyncWithServer() = 0;
 
     // Sets the window's background color to |color_argb|.
     virtual void SetBackgroundColor(uint32 color_argb) = 0;
 
     // Enables DPMS and forces it to the "on" state.
     virtual void ForceDPMSOn() = 0;
 
     // Returns information about the current outputs.
     // This method may block for 60 milliseconds or more.
-    virtual std::vector<OutputSnapshot> GetOutputs() = 0;
+    virtual std::vector<OutputSnapshot> GetOutputs(
+        const StateController* state_controller) = 0;
 
     // Gets details corresponding to |mode|.  Parameters may be NULL.
     // Returns true on success.
     virtual bool GetModeDetails(RRMode mode,
                                 int* width,
                                 int* height,
                                 bool* interlaced) = 0;
 
     // Calls XRRSetCrtcConfig() with the given options but some of our
     // default output count and rotation arguments.
@@ skipping 123 matching lines @@
   void SuspendDisplays();
 
   // Reprobes displays to handle changes made while the system was
   // suspended.
   void ResumeDisplays();
 
   const std::map<int, float>& GetMirroredDisplayAreaRatioMap() {
     return mirrored_display_area_ratio_map_;
   }
 
+  // Configure outputs with |kConfigureDelayMs| delay,
+  // so that time-consuming ConfigureOutputs() won't be called multiple times.
+  void ScheduleConfigureOutputs();
+
  private:
   // Configure outputs.
   void ConfigureOutputs();
 
-  // Configure outputs with |kConfigureDelayMs| delay,
-  // so that time-consuming ConfigureOutputs() won't be called multiple times.
-  void ScheduleConfigureOutputs();
-
   // Fires OnDisplayModeChanged() event to the observers.
   void NotifyOnDisplayChanged();
 
   // Switches to the state specified in |output_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 mirroing.
   // On success, updates |output_state_| and |power_state_| and returns true.
   bool EnterStateOrFallBackToSoftwareMirroring(
       OutputState output_state,
@@ skipping 58 matching lines @@
   scoped_ptr<base::OneShotTimer<OutputConfigurator> > configure_timer_;
 
   DISALLOW_COPY_AND_ASSIGN(OutputConfigurator);
 };
 
 typedef std::vector<OutputConfigurator::OutputSnapshot> OutputSnapshotList;
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_DISPLAY_OUTPUT_CONFIGURATOR_H_