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

chrome/browser/ui/views/tabs/tab_drag_controller2.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 "chrome/browser/ui/views/tabs/tab_drag_controller2.h"
 
 #include <math.h>
 #include <set>
 
 #include "base/callback.h"
@@ skipping 484 matching lines @@
 
 gfx::Point TabDragController2::GetWindowCreatePoint() const {
   gfx::Point cursor_point = GetCursorScreenPoint();
   if (dock_info_.type() != DockInfo::NONE && dock_info_.in_enable_area()) {
     // If we're going to dock, we need to return the exact coordinate,
     // otherwise we may attempt to maximize on the wrong monitor.
     return cursor_point;
   }
   // If the cursor is outside the monitor area, move it inside. For example,
   // dropping a tab onto the task bar on Windows produces this situation.
-  gfx::Rect work_area = gfx::Screen::GetMonitorWorkAreaNearestPoint(
-      cursor_point);
+  gfx::Rect work_area = gfx::Screen::GetMonitorNearestPoint(
+      cursor_point).work_area();
   if (!work_area.IsEmpty()) {
     if (cursor_point.x() < work_area.x())
       cursor_point.set_x(work_area.x());
     else if (cursor_point.x() > work_area.right())
       cursor_point.set_x(work_area.right());
     if (cursor_point.y() < work_area.y())
       cursor_point.set_y(work_area.y());
     else if (cursor_point.y() > work_area.bottom())
       cursor_point.set_y(work_area.bottom());
   }
@@ skipping 910 matching lines @@
   browser->window()->SetBounds(new_bounds);
   return browser;
 }
 
 void TabDragController2::SetTrackedByWorkspace(gfx::NativeWindow window,
                                                bool value) {
 #if defined(USE_ASH)
   ash::SetTrackedByWorkspace(window, value);
 #endif
 }