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

ui/views/widget/native_widget_aura.h

 // 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.
 
 #ifndef UI_VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_
 #define UI_VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_
 #pragma once
 
 #include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
@@ skipping 159 matching lines @@
 
  protected:
   internal::NativeWidgetDelegate* delegate() { return delegate_; }
 
  private:
   class ActiveWindowObserver;
 
   void SetInitialFocus();
 
 #if defined(ENABLE_DIP)
-  // Returns the monitor in which this widget is placed.
-  aura::Monitor* GetMonitor() const;
+  // Returns the scale factor of the monitor in which this widget is placed.
+  float GetMonitorScaleFactor() const;
 
   // Utility functions that convert point/size/rect between
   // the monitor's coordinate system and the widget's coordinate system.
+  // TODO(oshima): Remove these once aura supports DIP coordinate system.
   gfx::Point ConvertPointFromMonitor(const gfx::Point& point) const;
   gfx::Size ConvertSizeFromMonitor(const gfx::Size& size) const;
   gfx::Rect ConvertRectFromMonitor(const gfx::Rect& rect) const;
   gfx::Size ConvertSizeToMonitor(const gfx::Size& size) const;
   gfx::Rect ConvertRectToMonitor(const gfx::Rect& rect) const;
 #endif
 
   internal::NativeWidgetDelegate* delegate_;
 
   scoped_ptr<aura::RootWindow> root_window_;
@@ skipping 22 matching lines @@
   int last_drop_operation_;
 
   static bool g_aura_desktop_hax;
 
   DISALLOW_COPY_AND_ASSIGN(NativeWidgetAura);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_