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

ui/aura/root_window.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/root_window.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 61 matching lines @@
     if (target->event_filter())
       filters->push_back(target->event_filter());
     target = target->parent();
   }
   if (Env::GetInstance()->event_filter())
     filters->push_back(Env::GetInstance()->event_filter());
 }
 
 float GetDeviceScaleFactorFromMonitor(const aura::Window* window) {
   MonitorManager* monitor_manager = Env::GetInstance()->monitor_manager();
-  return monitor_manager->GetMonitorNearestWindow(window).device_scale_factor();
+  return monitor_manager->GetDisplayNearestWindow(window).device_scale_factor();
 }
 
 Window* ConsumerToWindow(ui::GestureConsumer* consumer) {
   return consumer && !consumer->ignores_events() ?
       static_cast<Window*>(consumer) : NULL;
 }
 
 }  // namespace
 
 CompositorLock::CompositorLock(RootWindow* root_window)
@@ skipping 946 matching lines @@
 void RootWindow::UnlockCompositor() {
   DCHECK(compositor_lock_);
   compositor_lock_ = NULL;
   if (draw_on_compositor_unlock_) {
     draw_on_compositor_unlock_ = false;
     ScheduleDraw();
   }
 }
 
 }  // namespace aura