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

ui/aura/monitor_manager.h

 // 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.
 
 #ifndef UI_AURA_MONITOR_MANAGER_H_
 #define UI_AURA_MONITOR_MANAGER_H_
 #pragma once
 
 #include <string>
 #include <vector>
@@ skipping 50 matching lines @@
   // configurations is passed as a vector of Monitor object, which
   // contains each monitor's new infomration.
   virtual void OnNativeMonitorsChanged(
       const std::vector<gfx::Display>& display) = 0;
 
   // Create a root window for given |monitor|.
   virtual RootWindow* CreateRootWindowForMonitor(
       const gfx::Display& display) = 0;
 
   // Returns the display at |index|. The display at 0 is considered "primary".
-  virtual const gfx::Display& GetMonitorAt(size_t index) = 0;
+  virtual const gfx::Display& GetDisplayAt(size_t index) = 0;
 
-  virtual size_t GetNumMonitors() const = 0;
+  virtual size_t GetNumDisplays() const = 0;
 
   // Returns the display object nearest given |window|.
-  virtual const gfx::Display& GetMonitorNearestWindow(
+  virtual const gfx::Display& GetDisplayNearestWindow(
       const Window* window) const = 0;
 
   // Returns the monitor object nearest given |pint|.
-  virtual const gfx::Display& GetMonitorNearestPoint(
+  virtual const gfx::Display& GetDisplayNearestPoint(
       const gfx::Point& point) const = 0;
 
  protected:
   // Calls observers' OnDisplayBoundsChanged methods.
   void NotifyBoundsChanged(const gfx::Display& display);
   void NotifyDisplayAdded(const gfx::Display& display);
   void NotifyDisplayRemoved(const gfx::Display& display);
 
  private:
   // If set before the RootWindow is created, the host window will cover the
   // entire monitor.  Note that this can still be overridden via the
   // switches::kAuraHostWindowSize flag.
   static bool use_fullscreen_host_window_;
 
   ObserverList<DisplayObserver> observers_;
   DISALLOW_COPY_AND_ASSIGN(MonitorManager);
 };
 
 }  // namespace aura
 
 #endif  // UI_AURA_MONITOR_MANAGER_H_