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

ash/wm/shelf_layout_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 "ash/wm/shelf_layout_manager.h"
 
 #include <algorithm>
 
 #include "ash/launcher/launcher.h"
 #include "ash/screen_ash.h"
@@ skipping 138 matching lines @@
 
 bool ShelfLayoutManager::IsVisible() const {
   return status_->IsVisible() && (state_.visibility_state == VISIBLE ||
       (state_.visibility_state == AUTO_HIDE &&
        state_.auto_hide_state == AUTO_HIDE_SHOWN));
 }
 
 gfx::Rect ShelfLayoutManager::GetMaximizedWindowBounds(
     aura::Window* window) {
   // TODO: needs to be multi-mon aware.
-  gfx::Rect bounds(gfx::Screen::GetMonitorNearestWindow(window).bounds());
+  gfx::Rect bounds(gfx::Screen::GetDisplayNearestWindow(window).bounds());
   if (auto_hide_behavior_ == SHELF_AUTO_HIDE_BEHAVIOR_DEFAULT ||
       auto_hide_behavior_ == SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS) {
     AdjustBoundsBasedOnAlignment(kAutoHideSize, &bounds);
     return bounds;
   }
   // SHELF_AUTO_HIDE_BEHAVIOR_NEVER maximized windows don't get any taller.
   return GetUnmaximizedWorkAreaBounds(window);
 }
 
 gfx::Rect ShelfLayoutManager::GetUnmaximizedWorkAreaBounds(
     aura::Window* window) {
   // TODO: needs to be multi-mon aware.
-  gfx::Rect bounds(gfx::Screen::GetMonitorNearestWindow(window).bounds());
+  gfx::Rect bounds(gfx::Screen::GetDisplayNearestWindow(window).bounds());
   int size;
   if (auto_hide_behavior_ == SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS) {
     size = kAutoHideSize;
   } else {
     int width, height;
     GetShelfSize(&width, &height);
     size = std::max(width, height);
   }
   AdjustBoundsBasedOnAlignment(size, &bounds);
   return bounds;
@@ skipping 19 matching lines @@
   if (status_area_widget)
     Shell::GetInstance()->status_area_widget()->SetShelfAlignment(alignment);
   LayoutShelf();
   return true;
 }
 
 gfx::Rect ShelfLayoutManager::GetIdealBounds() {
   // TODO: this is wrong. Figure out what monitor shelf is on and everything
   // should be based on it.
   gfx::Rect bounds(
-      gfx::Screen::GetMonitorNearestWindow(status_->GetNativeView()).bounds());
+      gfx::Screen::GetDisplayNearestWindow(status_->GetNativeView()).bounds());
   int width = 0, height = 0;
   GetShelfSize(&width, &height);
   switch (alignment_) {
     case SHELF_ALIGNMENT_BOTTOM:
       return gfx::Rect(bounds.x(), bounds.bottom() - height,
                        bounds.width(), height);
     case SHELF_ALIGNMENT_LEFT:
       return gfx::Rect(bounds.x(), bounds.y(), width, bounds.height());
     case SHELF_ALIGNMENT_RIGHT:
       return gfx::Rect(bounds.right() - width, bounds.y(), width,
@@ skipping 351 matching lines @@
 int ShelfLayoutManager::GetWorkAreaSize(const State& state, int size) const {
   if (state.visibility_state == VISIBLE)
     return size;
   if (state.visibility_state == AUTO_HIDE)
     return kAutoHideSize;
   return 0;
 }
 
 }  // namespace internal
 }  // namespace ash