Add ability to set resolution on external display

ash/display/display_manager.cc

 // 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.
 
 #include "ash/display/display_manager.h"
 
 #include <cmath>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 303 matching lines @@
         return;
       }
       info.set_ui_scale(ui_scale);
     }
     display_info_list.push_back(info);
   }
   AddMirrorDisplayInfoIfAny(&display_info_list);
   UpdateDisplays(display_info_list);
 }
 
+void DisplayManager::SetDisplayResolution(int64 display_id,
+                                          const gfx::Size& resolution) {
+  DCHECK_NE(gfx::Display::InternalDisplayId(), display_id);
+  if (gfx::Display::InternalDisplayId() == display_id)
+    return;
+  resolutions_[display_id] = resolution;
+#if defined(OS_CHROMEOS) && defined(USE_X11)
+  if (base::chromeos::IsRunningOnChromeOS())
+    Shell::GetInstance()->output_configurator()->ScheduleConfigureOutputs();
+#endif
+}
+
 void DisplayManager::RegisterDisplayProperty(
     int64 display_id,
     gfx::Display::Rotation rotation,
     float ui_scale,
-    const gfx::Insets* overscan_insets) {
+    const gfx::Insets* overscan_insets,
+    const gfx::Size& resolution_in_pixel) {

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

s/pixel/pixels/ (to match header)

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

Done.

   if (display_info_.find(display_id) == display_info_.end()) {
     display_info_[display_id] =
         DisplayInfo(display_id, std::string(""), false);
   }
 
   display_info_[display_id].set_rotation(rotation);
   // Just in case the preference file was corrupted.
   if (0.5f <= ui_scale && ui_scale <= 2.0f)
     display_info_[display_id].set_ui_scale(ui_scale);
   if (overscan_insets)
     display_info_[display_id].SetOverscanInsets(*overscan_insets);
+  if (!resolution_in_pixel.IsEmpty())
+    resolutions_[display_id] = resolution_in_pixel;
+}
+
+bool DisplayManager::GetSelectedResolutionForDisplayId(
+    int64 id,
+    gfx::Size* resolution_out) const {
+  std::map<int64, gfx::Size>::const_iterator iter =
+      resolutions_.find(id);
+  if (iter == resolutions_.end())
+    return false;
+  *resolution_out = iter->second;
+  return true;
 }
 
 bool DisplayManager::IsDisplayRotationEnabled() const {
   static bool enabled = !CommandLine::ForCurrentProcess()->
       HasSwitch(switches::kAshDisableDisplayRotation);
   return enabled;
 }
 
 bool DisplayManager::IsDisplayUIScalingEnabled() const {
   static bool enabled = !CommandLine::ForCurrentProcess()->
@@ skipping 528 matching lines @@
       break;
   }
   gfx::Insets insets = secondary_display->GetWorkAreaInsets();
   secondary_display->set_bounds(
       gfx::Rect(new_secondary_origin, secondary_bounds.size()));
   secondary_display->UpdateWorkAreaFromInsets(insets);
 }
 
 }  // namespace internal
 }  // namespace ash