Refactor screen/monitor so that gfx::Screen returns monitor object.

ui/views/widget/native_widget_aura.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 "ui/views/widget/native_widget_aura.h"
 
 #include "base/bind.h"
 #include "base/string_util.h"
 #include "third_party/skia/include/core/SkRegion.h"
 #include "ui/aura/client/activation_client.h"
@@ skipping 24 matching lines @@
 #include "ui/views/widget/tooltip_manager_aura.h"
 #include "ui/views/widget/widget_delegate.h"
 
 #if defined(OS_WIN)
 #include "base/win/scoped_gdi_object.h"
 #include "base/win/win_util.h"
 #include "ui/base/l10n/l10n_util_win.h"
 #endif
 
 #if defined(ENABLE_DIP)
-#include "ui/aura/monitor.h"
-#include "ui/aura/monitor_manager.h"
+#include "ui/gfx/monitor.h"
 #endif
 
 namespace views {
 
 bool NativeWidgetAura::g_aura_desktop_hax = false;
 
 namespace {
 
 aura::client::WindowType GetAuraWindowTypeForWidgetType(
     Widget::InitParams::Type type) {
@@ skipping 778 matching lines @@
 bool NativeWidgetAura::CanFocus() {
   return can_activate_;
 }
 
 void NativeWidgetAura::OnCaptureLost() {
   delegate_->OnMouseCaptureLost();
 }
 
 void NativeWidgetAura::OnPaint(gfx::Canvas* canvas) {
 #if defined(ENABLE_DIP)
-  aura::Monitor* monitor = GetMonitor();
   canvas->Save();
-  float scale = monitor->GetDeviceScaleFactor();
+  float scale = GetMonitorScaleFactor();
   canvas->sk_canvas()->scale(SkFloatToScalar(scale), SkFloatToScalar(scale));
 #endif
   delegate_->OnNativeWidgetPaint(canvas);
 #if defined(ENABLE_DIP)
   canvas->Restore();
 #endif
 }
 
 void NativeWidgetAura::OnWindowDestroying() {
   delegate_->OnNativeWidgetDestroying();
@@ skipping 84 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // NativeWidgetAura, private:
 
 void NativeWidgetAura::SetInitialFocus() {
   // The window does not get keyboard messages unless we focus it.
   if (!GetWidget()->SetInitialFocus())
     window_->Focus();
 }
 
 #if defined(ENABLE_DIP)
-aura::Monitor* NativeWidgetAura::GetMonitor() const {
-  return aura::Env::GetInstance()->monitor_manager()->
-      GetMonitorNearestWindow(window_);
+float NativeWidgetAura::GetMonitorScaleFactor() const {
+  gfx::Monitor monitor;
+  gfx::Screen::GetMonitorNearestWindow(window_, &monitor);
+  return monitor.device_scale_factor();
 }
 
 gfx::Point NativeWidgetAura::ConvertPointFromMonitor(
     const gfx::Point& point) const {
-  return point.Scale(1.0f / GetMonitor()->GetDeviceScaleFactor());
+  return point.Scale(1.0f / GetMonitorScaleFactor());
 }
 
 gfx::Size NativeWidgetAura::ConvertSizeFromMonitor(
     const gfx::Size& size) const {
-  return size.Scale(1.0f / GetMonitor()->GetDeviceScaleFactor());
+  return size.Scale(1.0f / GetMonitorScaleFactor());
 }
 
 gfx::Rect NativeWidgetAura::ConvertRectFromMonitor(
     const gfx::Rect& rect) const {
-  float scale = 1.0f / GetMonitor()->GetDeviceScaleFactor();
+  float scale = 1.0f / GetMonitorScaleFactor();
   return gfx::Rect(rect.origin().Scale(scale), rect.size().Scale(scale));
 }
 
 gfx::Size NativeWidgetAura::ConvertSizeToMonitor(const gfx::Size& size) const {
-  return size.Scale(GetMonitor()->GetDeviceScaleFactor());
+  return size.Scale(GetMonitorScaleFactor());
 }
 
 gfx::Rect NativeWidgetAura::ConvertRectToMonitor(const gfx::Rect& rect) const {
-  float scale = GetMonitor()->GetDeviceScaleFactor();
+  float scale = GetMonitorScaleFactor();
   return gfx::Rect(rect.origin().Scale(scale), rect.size().Scale(scale));
 }
 #endif
 
 ////////////////////////////////////////////////////////////////////////////////
 // Widget, public:
 
 // static
 void Widget::NotifyLocaleChanged() {
   // Deliberately not implemented.
@@ skipping 96 matching lines @@
   }
 }
 
 // static
 bool NativeWidgetPrivate::IsMouseButtonDown() {
   return aura::Env::GetInstance()->is_mouse_button_down();
 }
 
 }  // namespace internal
 }  // namespace views