Add ability to set resolution on external display

ash/display/display_info.h

 // Copyright (c) 2013 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 ASH_DISPLAY_DISPLAY_INFO_H_
 #define ASH_DISPLAY_DISPLAY_INFO_H_
 
 #include <string>
+#include <vector>
 
 #include "ash/ash_export.h"
 #include "base/gtest_prod_util.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/insets.h"
 #include "ui/gfx/rect.h"
 
 namespace ash {
 namespace internal {
 
+// A struct that represents the display's resolution and
+// interlaced info.
+struct ASH_EXPORT Resolution {
+  Resolution(const gfx::Size& s, bool i);

[Daniel Erat, 2013/07/31 17:34:05]

nit: name parameters 'size' and 'interlaced' instead (you can do:

  Resolution::Resolution(...)
      : size(size),
        interlaced(interlaced) {
  }

)

[oshima, 2013/07/31 21:59:49]

Done. I'll keept the constructor in .cc as this has non trivial
member variable.

+  gfx::Size size;
+  bool interlaced;
+};
+
 // DisplayInfo contains metadata for each display. This is used to
 // create |gfx::Display| as well as to maintain extra infomation
 // to manage displays in ash environment.
 // This class is intentionally made copiable.
 class ASH_EXPORT DisplayInfo {
  public:
   // Creates a DisplayInfo from string spec. 100+200-1440x800 creates display
   // whose size is 1440x800 at the location (100, 200) in host coordinates.
   // The format is
   //
@@ skipping 78 matching lines @@
   // and rotation settings.
   void UpdateDisplaySize();
 
   // Sets/Clears the overscan insets.
   void SetOverscanInsets(const gfx::Insets& insets_in_dip);
   gfx::Insets GetOverscanInsetsInPixel() const;
 
   void set_native(bool native) { native_ = native; }
   bool native() const { return native_; }
 
-  // Returns a string representation of the DisplayInfo;
+  const std::vector<Resolution>& resolutions() const {
+    return resolutions_;
+  }
+  void set_resolutions(std::vector<Resolution>& resolution) {
+    resolutions_.swap(resolution);
+  }
+
+  // Returns a string representation of the DisplayInfo
+  // excluding resolutions.
   std::string ToString() const;
 
+  // Returns a string representation of the DisplayInfo
+  // including resolutions.
+  std::string ToFullString() const;
+
  private:
   int64 id_;
   std::string name_;
   bool has_overscan_;
   gfx::Display::Rotation rotation_;
   float device_scale_factor_;
   gfx::Rect bounds_in_pixel_;
   // The size of the display in use. The size can be different from the size
   // of |bounds_in_pixel_| if the display has overscan insets and/or rotation.
   gfx::Size size_in_pixel_;
   gfx::Insets overscan_insets_in_dip_;
 
   // UI scale of the display.
   float ui_scale_;
 
   // True if this comes from native platform (DisplayChangeObserverX11).
   bool native_;
+
+  // The list of resolutions supported by this display.
+  std::vector<Resolution> resolutions_;
 };
 
 }  // namespace internal
 }  // namespace ash
 
 #endif  //  ASH_DISPLAY_DISPLAY_INFO_H_