Refactor screen/monitor so that gfx::Screen returns monitor object.

ash/wm/window_animations.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/window_animations.h"
 
 #include "ash/ash_switches.h"
 #include "ash/launcher/launcher.h"
 #include "ash/shell.h"
 #include "base/command_line.h"
@@ skipping 328 matching lines @@
   animator->set_preemption_strategy(
       ui::LayerAnimator::IMMEDIATELY_SET_NEW_TARGET);
 }
 
 gfx::Rect GetMinimizeRectForWindow(aura::Window* window) {
   gfx::Rect target_bounds = Shell::GetInstance()->launcher()->
       GetScreenBoundsOfItemIconForWindow(window);
   if (target_bounds.IsEmpty()) {
     // Assume the launcher is overflowed, zoom off to the bottom right of the
     // work area.
-    gfx::Rect work_area = gfx::Screen::GetMonitorWorkAreaNearestWindow(window);
+    gfx::Rect work_area =
+        gfx::Screen::GetMonitorNearestWindow(window).work_area();
     target_bounds.SetRect(work_area.right(), work_area.bottom(), 0, 0);
   }
   return target_bounds;
 }
 
 void AddLayerAnimationsForMinimize(aura::Window* window, bool show) {
   // Recalculate the transform at restore time since the launcher item may have
   // moved while the window was minimized.
   gfx::Rect bounds = window->bounds();
   gfx::Rect target_bounds = GetMinimizeRectForWindow(window);
@@ skipping 135 matching lines @@
 }
 
 }  // namespace internal
 
 ui::ImplicitAnimationObserver* CreateHidingWindowAnimationObserver(
     aura::Window* window) {
   return new internal::HidingWindowAnimationObserver(window);
 }
 
 }  // namespace ash