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

ash/monitor/multi_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 ASH_MONITOR_MULTI_MONITOR_MANAGER_H_
 #define ASH_MONITOR_MULTI_MONITOR_MANAGER_H_
 #pragma once
 
 #include <vector>
 
@@ skipping 30 matching lines @@
   static void ToggleMonitorScale();
 
   bool UpdateWorkAreaOfMonitorNearestWindow(const aura::Window* window,
                                             const gfx::Insets& insets);
 
   // MonitorManager overrides:
   virtual void OnNativeMonitorsChanged(
       const std::vector<gfx::Display>& displays) OVERRIDE;
   virtual aura::RootWindow* CreateRootWindowForMonitor(
       const gfx::Display& display) OVERRIDE;
-  virtual const gfx::Display& GetMonitorAt(size_t index) OVERRIDE;
+  virtual const gfx::Display& GetDisplayAt(size_t index) OVERRIDE;
 
-  virtual size_t GetNumMonitors() const OVERRIDE;
-  virtual const gfx::Display& GetMonitorNearestPoint(
+  virtual size_t GetNumDisplays() const OVERRIDE;
+  virtual const gfx::Display& GetDisplayNearestPoint(
       const gfx::Point& point) const OVERRIDE;
-  virtual const gfx::Display& GetMonitorNearestWindow(
+  virtual const gfx::Display& GetDisplayNearestWindow(
       const aura::Window* window) const OVERRIDE;
 
   // RootWindowObserver overrides:
   virtual void OnRootWindowResized(const aura::RootWindow* root,
                                    const gfx::Size& new_size) OVERRIDE;
 
  private:
   typedef std::vector<gfx::Display> Displays;
 
   void Init();
   void AddRemoveMonitorImpl();
   void CycleMonitorImpl();
   void ScaleMonitorImpl();
   gfx::Display& FindDisplayById(int id);
 
   Displays displays_;
 
   DISALLOW_COPY_AND_ASSIGN(MultiMonitorManager);
 };
 
 extern const aura::WindowProperty<int>* const kMonitorIdKey;
 
 }  // namespace internal
 }  // namespace ash
 
 #endif  // ASH_MONITOR_MULTI_MONITOR_MANAGER_H_