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

ash/wm/window_resizer.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_resizer.h"
 
 #include "ash/shell.h"
 #include "ash/wm/root_window_event_filter.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/root_window.h"
@@ skipping 185 matching lines @@
   // repositioning the window when the minimize size is reached.
   gfx::Size size = GetSizeForDrag(details, &delta_x, &delta_y, grid_size);
   gfx::Point origin = GetOriginForDrag(details, delta_x, delta_y);
 
   gfx::Rect new_bounds(origin, size);
   // Update bottom edge to stay in the work area when we are resizing
   // by dragging the bottome edge or corners.
   if (details.window_component == HTBOTTOM ||
       details.window_component == HTBOTTOMRIGHT ||
       details.window_component == HTBOTTOMLEFT) {
-    gfx::Rect work_area = gfx::Screen::GetMonitorWorkAreaNearestWindow(
-        details.window);
+    gfx::Rect work_area = gfx::Screen::GetMonitorNearestWindow(
+        details.window).work_area();
     if (new_bounds.bottom() > work_area.bottom())
       new_bounds.Inset(0, 0, 0,
                        new_bounds.bottom() - work_area.bottom());
   }
   if (details.bounds_change & kBoundsChange_Resizes &&
       details.bounds_change & kBoundsChange_Repositions && new_bounds.y() < 0) {
     int delta = new_bounds.y();
     new_bounds.set_y(0);
     new_bounds.set_height(new_bounds.height() + delta);
   }
@@ skipping 70 matching lines @@
 
     // Ensure we don't shrink past the minimum width and clamp delta_x
     // for the window origin computation.
     if (width < min_width) {
       width = min_width;
       *delta_x = -x_multiplier * (details.initial_bounds.width() - min_width);
     }
 
     // And don't let the window go bigger than the monitor.
     int max_width =
-        gfx::Screen::GetMonitorAreaNearestWindow(details.window).width();
+        gfx::Screen::GetMonitorNearestWindow(details.window).bounds().width();
     if (width > max_width) {
       width = max_width;
       *delta_x = -x_multiplier * (details.initial_bounds.width() - max_width);
     }
   }
   return width;
 }
 
 // static
 int WindowResizer::GetHeightForDrag(const Details& details,
@@ skipping 13 matching lines @@
 
     // Ensure we don't shrink past the minimum height and clamp delta_y
     // for the window origin computation.
     if (height < min_height) {
       height = min_height;
       *delta_y = -y_multiplier * (details.initial_bounds.height() - min_height);
     }
 
     // And don't let the window go bigger than the monitor.
     int max_height =
-        gfx::Screen::GetMonitorAreaNearestWindow(details.window).height();
+        gfx::Screen::GetMonitorNearestWindow(details.window).bounds().height();
     if (height > max_height) {
       height = max_height;
       *delta_y = -y_multiplier * (details.initial_bounds.height() - max_height);
     }
   }
   return height;
 }
 
 }  // namespace aura