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

ui/aura/single_monitor_manager.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 "ui/aura/single_monitor_manager.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "ui/aura/aura_switches.h"
@@ skipping 36 matching lines @@
 RootWindow* SingleMonitorManager::CreateRootWindowForMonitor(
     const gfx::Display& display) {
   DCHECK(!root_window_);
   DCHECK_EQ(display_.id(), display.id());
   root_window_ = new RootWindow(display.bounds());
   root_window_->AddObserver(this);
   root_window_->Init();
   return root_window_;
 }
 
-const gfx::Display& SingleMonitorManager::GetMonitorAt(size_t index) {
+const gfx::Display& SingleMonitorManager::GetDisplayAt(size_t index) {
   return display_;
 }
 
-size_t SingleMonitorManager::GetNumMonitors() const {
+size_t SingleMonitorManager::GetNumDisplays() const {
   return 1;
 }
 
-const gfx::Display& SingleMonitorManager::GetMonitorNearestWindow(
+const gfx::Display& SingleMonitorManager::GetDisplayNearestWindow(
     const Window* window) const {
   return display_;
 }
 
-const gfx::Display& SingleMonitorManager::GetMonitorNearestPoint(
+const gfx::Display& SingleMonitorManager::GetDisplayNearestPoint(
     const gfx::Point& point) const {
   return display_;
 }
 
 void SingleMonitorManager::OnWindowBoundsChanged(
     Window* window, const gfx::Rect& old_bounds, const gfx::Rect& new_bounds) {
   if (!use_fullscreen_host_window()) {
     Update(new_bounds.size());
     NotifyBoundsChanged(display_);
   }
 }
 
 void SingleMonitorManager::OnWindowDestroying(Window* window) {
   if (root_window_ == window)
     root_window_ = NULL;
 }
 
 void SingleMonitorManager::Init() {
   const string size_str = CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
       switches::kAuraHostWindowSize);
   display_ = CreateMonitorFromSpec(size_str);
 }
 
 void SingleMonitorManager::Update(const gfx::Size size) {
   display_.SetSize(size);
 }
 
 }  // namespace aura