Move DIP translation from ui/aura to ui/compositor

ash/monitor/multi_monitor_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/monitor/multi_monitor_manager.h"
 
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 39 matching lines @@
       aura::Env::GetInstance()->monitor_manager());
   manager->AddRemoveMonitorImpl();
 }
 
 void MultiMonitorManager::CycleMonitor() {
   MultiMonitorManager* manager = static_cast<MultiMonitorManager*>(
       aura::Env::GetInstance()->monitor_manager());
   manager->CycleMonitorImpl();
 }
 
+void MultiMonitorManager::ScaleMonitor() {
+  MultiMonitorManager* manager = static_cast<MultiMonitorManager*>(
+      aura::Env::GetInstance()->monitor_manager());
+  manager->ScaleMonitorImpl();
+}
+
 void MultiMonitorManager::OnNativeMonitorsChanged(
     const std::vector<Monitor>& new_monitors) {
   size_t min = std::min(monitors_.size(), new_monitors.size());
 
   // For m19, we only care about 1st monitor as primary, and
   // don't differentiate the rest of monitors as all secondary
   // monitors have the same content. ID for primary monitor stays the same
   // because we never remove it, we don't update IDs for other monitors
   // , for now, because they're the same.
   // TODO(oshima): Fix this so that we can differentiate outputs
@@ skipping 127 matching lines @@
     for (Monitors::const_iterator iter = monitors_.begin() + 1;
          iter != monitors_.end(); ++iter) {
       gfx::Monitor monitor = *iter;
       new_monitors.push_back(monitor);
     }
     new_monitors.push_back(monitors_.front());
     OnNativeMonitorsChanged(new_monitors);
   }
 }
 
+void MultiMonitorManager::ScaleMonitorImpl() {
+  if (monitors_.size() > 0) {
+    std::vector<Monitor> new_monitors;
+    for (Monitors::const_iterator iter = monitors_.begin();
+         iter != monitors_.end(); ++iter) {
+      gfx::Monitor monitor = *iter;
+      float next = monitor.device_scale_factor() == 1.0f ? 2.0f : 1.0f;

[Daniel Erat, 2012/05/07 19:44:05]

nit: s/next/factor/

[oshima, 2012/05/08 00:17:24]

Done.

+      monitor.SetScaleAndBounds(
+          next, gfx::Rect(monitor.bounds_in_pixel().origin(),
+                          monitor.size().Scale(next)));
+      new_monitors.push_back(monitor);
+    }
+    OnNativeMonitorsChanged(new_monitors);
+  }
+}
+
 gfx::Monitor& MultiMonitorManager::FindMonitorById(int id) {
   for (Monitors::iterator iter = monitors_.begin();
        iter != monitors_.end(); ++iter) {
     if ((*iter).id() == id)
       return *iter;
   }
   DLOG(FATAL) << "Could not find monitor by id:" << id;
   return GetInvalidMonitor();
 }
 
 }  // namespace internal
 }  // namespace ash