Rename gfx::Monitor to gfx::Display

ui/compositor/dip_util.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/compositor/dip_util.h"
 
 #include "base/command_line.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/compositor/compositor.h"
 #include "ui/compositor/compositor_switches.h"
 #include "ui/compositor/layer.h"
-#include "ui/gfx/monitor.h"
+#include "ui/gfx/display.h"
 #include "ui/gfx/point.h"
+#include "ui/gfx/rect.h"
 #include "ui/gfx/size.h"
-#include "ui/gfx/rect.h"
 
 namespace ui {
 
 float GetDeviceScaleFactor(const Layer* layer) {
   return layer->device_scale_factor();
 }
 
 gfx::Point ConvertPointToDIP(const Layer* layer,
                              const gfx::Point& point_in_pixel) {
   return point_in_pixel.Scale(1.0f / GetDeviceScaleFactor(layer));
@@ skipping 21 matching lines @@
   return size_in_dip.Scale(GetDeviceScaleFactor(layer));
 }
 
 gfx::Rect ConvertRectToPixel(const Layer* layer,
                              const gfx::Rect& rect_in_dip) {
   float scale = GetDeviceScaleFactor(layer);
   return gfx::Rect(rect_in_dip.origin().Scale(scale),
                    rect_in_dip.size().Scale(scale));
 }
 }  // namespace ui