Rename gfx::Monitor to gfx::Display

ui/gfx/screen_mac.mm

 // 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/gfx/screen.h"
 
 #import <ApplicationServices/ApplicationServices.h>
 #import <Cocoa/Cocoa.h>
 
 @interface NSScreen (LionAPI)
 - (CGFloat)backingScaleFactor;
 @end
 
 #include "base/logging.h"
-#include "ui/gfx/monitor.h"
+#include "ui/gfx/display.h"
 
 namespace {
 
 gfx::Rect ConvertCoordinateSystem(NSRect ns_rect) {
   // Primary monitor is defined as the monitor with the menubar,
   // which is always at index 0.
   NSScreen* primary_screen = [[NSScreen screens] objectAtIndex:0];
   float primary_screen_height = [primary_screen frame].size.height;
   gfx::Rect rect(NSRectToCGRect(ns_rect));
   rect.set_y(primary_screen_height - rect.y() - rect.height());
@@ skipping 12 matching lines @@
     int area = intersection.width() * intersection.height();
     if (area > max_area) {
       max_area = area;
       max_screen = screen;
     }
   }
 
   return max_screen;
 }
 
-gfx::Monitor GetMonitorForScreen(NSScreen* screen, bool is_primary) {
+gfx::Display GetDisplayForScreen(NSScreen* screen, bool is_primary) {
   NSRect frame = [screen frame];
   // TODO(oshima): Implement ID and Observer.
-  gfx::Monitor monitor(0, gfx::Rect(NSRectToCGRect(frame)));
+  gfx::Display display(0, gfx::Rect(NSRectToCGRect(frame)));
 
   NSRect visible_frame = [screen visibleFrame];
 
   // Convert work area's coordinate systems.
   if (is_primary) {
     gfx::Rect work_area = gfx::Rect(NSRectToCGRect(visible_frame));
     work_area.set_y(frame.size.height - visible_frame.origin.y -
                     visible_frame.size.height);
-    monitor.set_work_area(work_area);
+    display.set_work_area(work_area);
   } else {
-    monitor.set_work_area(ConvertCoordinateSystem(visible_frame));
+    display.set_work_area(ConvertCoordinateSystem(visible_frame));
   }
   CGFloat scale;
   if ([screen respondsToSelector:@selector(backingScaleFactor)])
     scale = [screen backingScaleFactor];
   else
     scale = [screen userSpaceScaleFactor];
-  monitor.set_device_scale_factor(scale);
-  return monitor;
+  display.set_device_scale_factor(scale);
+  return display;
 }
 
 }  // namespace
 
 namespace gfx {
 
 // static
 bool Screen::IsDIPEnabled() {
   return false;
 }
 
 // static
 gfx::Point Screen::GetCursorScreenPoint() {
   NSPoint mouseLocation  = [NSEvent mouseLocation];
   // Flip coordinates to gfx (0,0 in top-left corner) using primary screen.
   NSScreen* screen = [[NSScreen screens] objectAtIndex:0];
   mouseLocation.y = NSMaxY([screen frame]) - mouseLocation.y;
   return gfx::Point(mouseLocation.x, mouseLocation.y);
 }
 
 // static
-gfx::Monitor Screen::GetMonitorNearestWindow(gfx::NativeView view) {
+gfx::Display Screen::GetMonitorNearestWindow(gfx::NativeView view) {
   NSWindow* window = [view window];
   if (!window)
     return GetPrimaryMonitor();
   NSScreen* match_screen = [window screen];
-  return GetMonitorForScreen(match_screen, false /* may not be primary */);
+  return GetDisplayForScreen(match_screen, false /* may not be primary */);
 }
 
 // static
-gfx::Monitor Screen::GetPrimaryMonitor() {
-  // Primary monitor is defined as the monitor with the menubar,
+gfx::Display Screen::GetPrimaryMonitor() {
+  // Primary display is defined as the display with the menubar,
   // which is always at index 0.
   NSScreen* primary = [[NSScreen screens] objectAtIndex:0];
-  gfx::Monitor monitor = GetMonitorForScreen(primary, true /* primary */);
-  return monitor;
+  gfx::Display display = GetDisplayForScreen(primary, true /* primary */);
+  return display;
 }
 
 // static
-gfx::Monitor Screen::GetMonitorMatching(const gfx::Rect& match_rect) {
+gfx::Display Screen::GetMonitorMatching(const gfx::Rect& match_rect) {
   NSScreen* match_screen = GetMatchingScreen(match_rect);
-  return GetMonitorForScreen(match_screen, false /* may not be primary */);
+  return GetDisplayForScreen(match_screen, false /* may not be primary */);
 }
 
 // static
 int Screen::GetNumMonitors() {
   // Don't just return the number of online displays.  It includes displays
   // that mirror other displays, which are not desired in the count.  It's
   // tempting to use the count returned by CGGetActiveDisplayList, but active
   // displays exclude sleeping displays, and those are desired in the count.
 
   // It would be ridiculous to have this many displays connected, but
@@ skipping 18 matching lines @@
       // The primary display in a mirrored set will be counted, but those that
       // mirror it will not be.
       ++display_count;
     }
   }
 
   return display_count;
 }
 
 }  // namespace gfx