Rename gfx::Monitor to gfx::Display

ash/screen_ash.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/screen_ash.h"
 
 #include "ash/shell.h"
 #include "ash/wm/shelf_layout_manager.h"
 #include "base/logging.h"
 #include "ui/aura/env.h"
 #include "ui/aura/monitor_manager.h"
 #include "ui/aura/root_window.h"
-#include "ui/gfx/monitor.h"
+#include "ui/gfx/display.h"
 #include "ui/gfx/screen.h"
 
 namespace ash {
 
 namespace {
 aura::MonitorManager* GetMonitorManager() {
   return aura::Env::GetInstance()->monitor_manager();
 }
 }  // namespace
 
@@ skipping 27 matching lines @@
 gfx::NativeWindow ScreenAsh::GetWindowAtCursorScreenPoint() {
   const gfx::Point point = gfx::Screen::GetCursorScreenPoint();
   // TODO(oshima): convert point to relateive to the root window.
   return Shell::GetRootWindowAt(point)->GetTopWindowContainingPoint(point);
 }
 
 int ScreenAsh::GetNumMonitors() {
   return GetMonitorManager()->GetNumMonitors();
 }
 
-gfx::Monitor ScreenAsh::GetMonitorNearestWindow(gfx::NativeView window) const {
+gfx::Display ScreenAsh::GetMonitorNearestWindow(gfx::NativeView window) const {
   return GetMonitorManager()->GetMonitorNearestWindow(window);
 }
 
-gfx::Monitor ScreenAsh::GetMonitorNearestPoint(const gfx::Point& point) const {
+gfx::Display ScreenAsh::GetMonitorNearestPoint(const gfx::Point& point) const {
   return GetMonitorManager()->GetMonitorNearestPoint(point);
 }
 
-gfx::Monitor ScreenAsh::GetPrimaryMonitor() const {
+gfx::Display ScreenAsh::GetPrimaryMonitor() const {
   return GetMonitorManager()->GetMonitorAt(0);
 }
 
 }  // namespace ash