Rename the remaining usage of Monitor to Display

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 188 matching lines @@
     launcher_->SetAlignment(alignment);
   StatusAreaWidget* status_area_widget =
       Shell::GetInstance()->status_area_widget();
   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
+  // TODO: this is wrong. Figure out what display shelf is on and everything
   // should be based on it.
   gfx::Rect 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:
@@ skipping 12 matching lines @@
   TargetBounds target_bounds;
   CalculateTargetBounds(state_, &target_bounds);
   if (launcher_widget()) {
     GetLayer(launcher_widget())->SetOpacity(target_bounds.opacity);
 
     launcher_widget()->SetBounds(target_bounds.launcher_bounds);
     launcher_->SetStatusSize(target_bounds.status_bounds.size());
   }
   GetLayer(status_)->SetOpacity(target_bounds.opacity);
   status_->SetBounds(target_bounds.status_bounds);
-  Shell::GetInstance()->SetMonitorWorkAreaInsets(
+  Shell::GetInstance()->SetDisplayWorkAreaInsets(
       Shell::GetPrimaryRootWindow(),
       target_bounds.work_area_insets);
   UpdateHitTestBounds();
 }
 
 void ShelfLayoutManager::UpdateVisibilityState() {
   ShellDelegate* delegate = Shell::GetInstance()->delegate();
   if (delegate && delegate->IsScreenLocked()) {
     SetState(VISIBLE);
   } else {
@@ skipping 124 matching lines @@
     GetLayer(launcher_widget())->SetBounds(target_bounds.launcher_bounds);
     GetLayer(launcher_widget())->SetOpacity(target_bounds.opacity);
   }
   ui::ScopedLayerAnimationSettings status_animation_setter(
       GetLayer(status_)->GetAnimator());
   status_animation_setter.SetTransitionDuration(
       base::TimeDelta::FromMilliseconds(130));
   status_animation_setter.SetTweenType(ui::Tween::EASE_OUT);
   GetLayer(status_)->SetBounds(target_bounds.status_bounds);
   GetLayer(status_)->SetOpacity(target_bounds.opacity);
-  Shell::GetInstance()->SetMonitorWorkAreaInsets(
+  Shell::GetInstance()->SetDisplayWorkAreaInsets(
       Shell::GetPrimaryRootWindow(),
       target_bounds.work_area_insets);
   UpdateHitTestBounds();
   UpdateShelfBackground(change_type);
 }
 
 void ShelfLayoutManager::StopAnimating() {
   if (launcher_widget())
     GetLayer(launcher_widget())->GetAnimator()->StopAnimating();
   GetLayer(status_)->GetAnimator()->StopAnimating();
@@ skipping 176 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