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

ui/views/widget/native_widget_aura.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/views/widget/native_widget_aura.h"
 
 #include "base/bind.h"
 #include "base/string_util.h"
 #include "third_party/skia/include/core/SkRegion.h"
 #include "ui/aura/client/activation_change_observer.h"
@@ skipping 338 matching lines @@
   input_method->Init(GetWidget());
   return input_method;
 }
 
 void NativeWidgetAura::CenterWindow(const gfx::Size& size) {
   gfx::Rect parent_bounds(window_->parent()->GetBoundsInRootWindow());
   // When centering window, we take the intersection of the host and
   // the parent. We assume the root window represents the visible
   // rect of a single screen.
   gfx::Rect work_area =
-      gfx::Screen::GetMonitorNearestWindow(window_).work_area();
+      gfx::Screen::GetDisplayNearestWindow(window_).work_area();
   parent_bounds = parent_bounds.Intersect(work_area);
 
   // If |window_|'s transient parent's bounds are big enough to fit it, then we
   // center it with respect to the transient parent.
   if (window_->transient_parent()) {
     gfx::Rect transient_parent_rect = window_->transient_parent()->
         GetBoundsInRootWindow().Intersect(work_area);
     if (transient_parent_rect.height() >= size.height() &&
         transient_parent_rect.width() >= size.width())
       parent_bounds = transient_parent_rect;
@@ skipping 265 matching lines @@
   if (window_ && window_->GetFocusManager() &&
       window_->Contains(window_->GetFocusManager()->GetFocusedWindow()))
     window_->GetFocusManager()->SetFocusedWindow(window_, NULL);
 }
 
 void NativeWidgetAura::FocusNativeView(gfx::NativeView native_view) {
   window_->GetFocusManager()->SetFocusedWindow(native_view, NULL);
 }
 
 gfx::Rect NativeWidgetAura::GetWorkAreaBoundsInScreen() const {
-  return gfx::Screen::GetMonitorNearestWindow(GetNativeView()).work_area();
+  return gfx::Screen::GetDisplayNearestWindow(GetNativeView()).work_area();
 }
 
 void NativeWidgetAura::SetInactiveRenderingDisabled(bool value) {
   if (!value)
     active_window_observer_.reset();
   else
     active_window_observer_.reset(new ActiveWindowObserver(this));
 }
 
 Widget::MoveLoopResult NativeWidgetAura::RunMoveLoop() {
@@ skipping 371 matching lines @@
   return aura::Env::GetInstance()->is_mouse_button_down();
 }
 
 // static
 bool NativeWidgetPrivate::IsTouchDown() {
   return aura::Env::GetInstance()->is_touch_down();
 }
 
 }  // namespace internal
 }  // namespace views