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

ash/monitor/monitor_controller.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 "ash/monitor/monitor_controller.h"
 
 #include "ash/ash_switches.h"
 #include "ash/monitor/multi_monitor_manager.h"
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"
@@ skipping 28 matching lines @@
     if (controller)
       delete controller;
     else
       delete it->second;
   }
 }
 
 void MonitorController::InitPrimaryDisplay() {
   aura::MonitorManager* monitor_manager =
       aura::Env::GetInstance()->monitor_manager();
-  const gfx::Display& display = monitor_manager->GetMonitorAt(0);
+  const gfx::Display& display = monitor_manager->GetDisplayAt(0);
   DCHECK_EQ(0, display.id());
   aura::RootWindow* root =
       monitor_manager->CreateRootWindowForMonitor(display);
   root_windows_[display.id()] = root;
   if (aura::MonitorManager::use_fullscreen_host_window() &&
       !IsExtendedDesktopEnabled()) {
     root->ConfineCursorToWindow();
   }
   root->SetHostBounds(display.bounds_in_pixel());
 }
 
 void MonitorController::InitSecondaryDisplays() {
   aura::MonitorManager* monitor_manager =
       aura::Env::GetInstance()->monitor_manager();
-  for (size_t i = 1; i < monitor_manager->GetNumMonitors(); ++i) {
-    const gfx::Display& display = monitor_manager->GetMonitorAt(i);
+  for (size_t i = 1; i < monitor_manager->GetNumDisplays(); ++i) {
+    const gfx::Display& display = monitor_manager->GetDisplayAt(i);
     aura::RootWindow* root =
         monitor_manager->CreateRootWindowForMonitor(display);
     root_windows_[display.id()] = root;
     Shell::GetInstance()->InitRootWindowForSecondaryMonitor(root);
   }
 }
 
 aura::RootWindow* MonitorController::GetPrimaryRootWindow() {
   DCHECK(!root_windows_.empty());
   return root_windows_[0];
@@ skipping 85 matching lines @@
           switches::kAshExtendedDesktop);
 }
 
 // static
 void MonitorController::SetExtendedDesktopEnabled(bool enabled) {
   extended_desktop_enabled = enabled;
 }
 
 }  // namespace internal
 }  // namespace ash