Add ability to set resolution on external display

ash/display/display_info.cc

 // 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.
 
 #include <stdio.h>
 #include <string>
 #include <vector>
 
 #include "ash/display/display_info.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/size_conversions.h"
 #include "ui/gfx/size_f.h"
 
 #if defined(OS_WIN)
 #include "ui/aura/root_window_host.h"
 #endif
 
 namespace ash {
 namespace internal {
 
+Resolution::Resolution(const gfx::Size& size, bool interlaced)
+    : size(size),
+      interlaced(interlaced) {
+}
+
 // satic
 DisplayInfo DisplayInfo::CreateFromSpec(const std::string& spec) {
   return CreateFromSpecWithID(spec, gfx::Display::kInvalidDisplayID);
 }
 
 // static
 DisplayInfo DisplayInfo::CreateFromSpecWithID(const std::string& spec,
                                               int64 id) {
   // Default bounds for a display.
   const int kDefaultHostWindowX = 200;
@@ skipping 56 matching lines @@
              &device_scale_factor) >= 4) {
     bounds_in_pixel.SetRect(x, y, width, height);
   }
   if (id == gfx::Display::kInvalidDisplayID)
     id = synthesized_display_id++;
   DisplayInfo display_info(
       id, base::StringPrintf("Display-%d", static_cast<int>(id)), has_overscan);
   display_info.set_device_scale_factor(device_scale_factor);
   display_info.set_rotation(rotation);
   display_info.set_ui_scale(ui_scale);
   display_info.SetBounds(bounds_in_pixel);

[Jun Mukai, 2013/07/31 23:10:00]

should we add the specified display's size to |resolutions_| ?

[oshima, 2013/07/31 23:29:26]

I didn't add it because it's not necessary, and in order to
use it for testing, it's better to add them manually.
(rather than adding another format)

 
   // To test the overscan, it creates the default 5% overscan.
   if (has_overscan) {
     int width = bounds_in_pixel.width() / device_scale_factor / 40;
     int height = bounds_in_pixel.height() / device_scale_factor / 40;
     display_info.SetOverscanInsets(gfx::Insets(height, width, height, width));
     display_info.UpdateDisplaySize();
   }
 
   DVLOG(1) << "DisplayInfoFromSpec info=" << display_info.ToString()
@@ skipping 29 matching lines @@
 
 void DisplayInfo::Copy(const DisplayInfo& native_info) {
   DCHECK(id_ == native_info.id_);
   name_ = native_info.name_;
   has_overscan_ = native_info.has_overscan_;
 
   DCHECK(!native_info.bounds_in_pixel_.IsEmpty());
   bounds_in_pixel_ = native_info.bounds_in_pixel_;
   size_in_pixel_ = native_info.size_in_pixel_;
   device_scale_factor_ = native_info.device_scale_factor_;
+  resolutions_ = native_info.resolutions_;
 
   // Copy overscan_insets_in_dip_ if it's not empty. This is for test
   // cases which use "/o" annotation which sets the overscan inset
   // to native, and that overscan has to be propagated. This does not
   // happen on the real environment.
   if (!native_info.overscan_insets_in_dip_.empty())
     overscan_insets_in_dip_ = native_info.overscan_insets_in_dip_;
 
   // Rotation_ and ui_scale_ are given by preference, or unit
   // tests. Don't copy if this native_info came from
@@ skipping 46 matching lines @@
       "overscan=%s, rotation=%d, ui-scale=%f",
       static_cast<long long int>(id_),
       bounds_in_pixel_.ToString().c_str(),
       size_in_pixel_.ToString().c_str(),
       device_scale_factor_,
       overscan_insets_in_dip_.ToString().c_str(),
       rotation_degree,
       ui_scale_);
 }
 
+std::string DisplayInfo::ToFullString() const {
+  std::string resolutions_str;
+  std::vector<Resolution>::const_iterator iter = resolutions_.begin();
+  for (; iter != resolutions_.end(); ++iter) {
+    if (resolutions_str.empty())

[Daniel Erat, 2013/07/31 22:10:17]

the other way, right? you should only append the comma if
!resolutions_str.empty()

[oshima, 2013/07/31 23:29:26]

oops, you're right. done.

+      resolutions_str += ",";
+    resolutions_str += iter->size.ToString();
+    if (iter->interlaced)
+      resolutions_str += "(i)";
+  }
+  return ToString() + ", resolutions=" + resolutions_str;
+}
+
 }  // namespace internal
 }  // namespace ash