Rename gfx::Monitor to gfx::Display

content/browser/renderer_host/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 "content/browser/renderer_host/dip_util.h"
 
 #include "content/public/browser/render_widget_host_view.h"
-#include "ui/gfx/monitor.h"
+#include "ui/gfx/display.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/screen.h"
 #include "ui/gfx/size.h"
 
 namespace content {
 
 float GetDIPScaleFactor(const RenderWidgetHostView* view) {
 // MacOS does not have an implementation of
 // Screen::GetMonitorNearestWindow
 // TODO(pkotwicz): Fix this. (crbug.com/129409).
 #if !defined(OS_MACOSX)
   if (gfx::Screen::IsDIPEnabled()) {
-    gfx::Monitor monitor = gfx::Screen::GetMonitorNearestWindow(
+    gfx::Display display = gfx::Screen::GetMonitorNearestWindow(
         view ? view->GetNativeView() : NULL);
-    return monitor.device_scale_factor();
+    return display.device_scale_factor();
   }
 #endif
   return 1.0f;
 }
 
 gfx::Point ConvertPointToDIP(const RenderWidgetHostView* view,
                              const gfx::Point& point_in_pixel) {
   return point_in_pixel.Scale(1.0f / GetDIPScaleFactor(view));
 }
 
@@ skipping 20 matching lines @@
 }
 
 gfx::Rect ConvertRectToPixel(const RenderWidgetHostView* view,
                              const gfx::Rect& rect_in_dip) {
     float scale = GetDIPScaleFactor(view);
     return gfx::Rect(rect_in_dip.origin().Scale(scale),
                      rect_in_dip.size().Scale(scale));
 }
 
 }  // namespace content