Add ability to set resolution on external display

ash/accelerators/accelerator_controller.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/accelerators/accelerator_controller.h"
 
 #include <algorithm>
 #include <cmath>
 #include <iostream>
 #include <string>
@@ skipping 53 matching lines @@
 #include "ui/oak/oak.h"
 #include "ui/views/controls/webview/webview.h"
 #include "ui/views/debug_utils.h"
 #include "ui/views/widget/widget.h"
 
 #if defined(OS_CHROMEOS)
 #include "ash/system/chromeos/keyboard_brightness_controller.h"
 #include "base/chromeos/chromeos_version.h"
 #endif  // defined(OS_CHROMEOS)
 
+#include "ash/display/display_info.h"

[oshima, 2013/07/31 16:39:11]

Changes in this file is just for my testing and I'll revert
before landing, so please ignore them.

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

am i misunderstanding? the change in e.g. HandleScaleUI() doesn't look like it's
for testing

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

Sorry if it wasn't clear enough.
It was for me to test this feature without UI (UI will be added separately).
This file as been removed from CL in the latest patch.

+
 namespace ash {
 namespace {
 
 using internal::DisplayInfo;
 
 bool DebugShortcutsEnabled() {
 #if defined(NDEBUG)
   return CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kAshDebugShortcuts);
 #else
@@ skipping 102 matching lines @@
   switch (current) {
     case gfx::Display::ROTATE_0:
       return gfx::Display::ROTATE_90;
     case gfx::Display::ROTATE_90:
       return gfx::Display::ROTATE_180;
     case gfx::Display::ROTATE_180:
       return gfx::Display::ROTATE_270;
     case gfx::Display::ROTATE_270:
       return gfx::Display::ROTATE_0;
   }
-  NOTREACHED() << "Unknown rotation:" << current;
+  NOTREACHED() << "Unknown rotatgion:" << current;

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

nit: s/rotatgion/rotation/

   return gfx::Display::ROTATE_0;
 }
 
+const gfx::Size& FindNextResolution(
+    const std::vector<internal::Resolution>& resolutions,
+    const gfx::Size& current_resolution) {
+  std::vector<internal::Resolution>::const_iterator iter =
+      resolutions.begin();
+  for (; iter != resolutions.end(); ++iter) {
+    if (iter->size == current_resolution) {
+      ++iter;
+      break;
+    }
+  }
+  if (iter == resolutions.end())
+    return resolutions[0].size;
+  else
+    return iter->size;
+}
+
 bool HandleScaleUI(bool up) {
   internal::DisplayManager* display_manager =
       Shell::GetInstance()->display_manager();
+
+  gfx::Point point = Shell::GetScreen()->GetCursorScreenPoint();
+  gfx::Display display = Shell::GetScreen()->GetDisplayNearestPoint(point);
+  if (!display.IsInternal()) {
+    const DisplayInfo& info = display_manager->GetDisplayInfo(display.id());
+    if (info.resolutions().empty()) {
+      LOG(ERROR) << "No resolution found:";
+      return false;
+    }
+    const gfx::Size& next_resolution =
+        FindNextResolution(info.resolutions(), info.bounds_in_pixel().size());
+    display_manager->SetDisplayResolution(display.id(), next_resolution);
+    return true;
+  }
+
   int64 display_id = display_manager->GetDisplayIdForUIScaling();
   if (display_id == gfx::Display::kInvalidDisplayID)
     return false;
   const DisplayInfo& display_info = display_manager->GetDisplayInfo(display_id);
   float next_scale =
       internal::DisplayManager::GetNextUIScale(display_info, up);
   display_manager->SetDisplayUIScale(display_id, next_scale);
   return true;
 }
 
@@ skipping 755 matching lines @@
     keyboard_brightness_control_delegate) {
   keyboard_brightness_control_delegate_ =
       keyboard_brightness_control_delegate.Pass();
 }
 
 bool AcceleratorController::CanHandleAccelerators() const {
   return true;
 }
 
 }  // namespace ash