Rename gfx::Screen::GetMonitorXXXX to gfx::Screen::GetDisplayXXX.

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)
@@ skipping 71 matching lines @@
 // 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::Display Screen::GetMonitorNearestWindow(gfx::NativeView view) {
+gfx::Display Screen::GetDisplayNearestWindow(gfx::NativeView view) {
   NSWindow* window = [view window];
   if (!window)
-    return GetPrimaryMonitor();
+    return GetPrimaryDisplay();
   NSScreen* match_screen = [window screen];
   return GetDisplayForScreen(match_screen, false /* may not be primary */);
 }
 
 // static
-gfx::Display Screen::GetPrimaryMonitor() {
+gfx::Display Screen::GetPrimaryDisplay() {
   // Primary display is defined as the display with the menubar,
   // which is always at index 0.
   NSScreen* primary = [[NSScreen screens] objectAtIndex:0];
   gfx::Display display = GetDisplayForScreen(primary, true /* primary */);
   return display;
 }
 
 // static
-gfx::Display Screen::GetMonitorMatching(const gfx::Rect& match_rect) {
+gfx::Display Screen::GetDisplayMatching(const gfx::Rect& match_rect) {
   NSScreen* match_screen = GetMatchingScreen(match_rect);
   return GetDisplayForScreen(match_screen, false /* may not be primary */);
 }
 
 // static
-int Screen::GetNumMonitors() {
+int Screen::GetNumDisplays() {
   // 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
   // CGDirectDisplayID is just an integer, so supporting up to this many
   // doesn't hurt.
   CGDirectDisplayID online_displays[128];
   CGDisplayCount online_display_count = 0;
@@ skipping 14 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;
 }
 
 // static
-gfx::Display Screen::GetMonitorNearestPoint(const gfx::Point& point) {
+gfx::Display Screen::GetDisplayNearestPoint(const gfx::Point& point) {
   NSPoint ns_point = NSPointFromCGPoint(point.ToCGPoint());
 
   NSArray* screens = [NSScreen screens];
   NSScreen* primary = [screens objectAtIndex:0];
   for (NSScreen* screen in screens) {
     if (NSMouseInRect(ns_point, [screen frame], NO))
       return GetDisplayForScreen(screen, screen == primary);
   }
   NOTREACHED();
   return gfx::Display();
 }
 
 }  // namespace gfx