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

chrome/browser/ui/tabs/dock_info_win.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/tabs/dock_info.h"
 
 #include "base/win/scoped_gdi_object.h"
 #include "base/win/windows_version.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
@@ skipping 224 matching lines @@
       return true;
     }
     return false;
   }
 
  private:
   DockToWindowFinder(const gfx::Point& screen_loc,
                      const std::set<HWND>& ignore)
       : BaseWindowFinder(ignore),
         screen_loc_(screen_loc) {
-    gfx::Rect work_area = gfx::Screen::GetMonitorWorkAreaNearestPoint(
-        screen_loc);
+    gfx::Rect work_area = gfx::Screen::GetMonitorNearestPoint(
+        screen_loc).bounds();
     if (!work_area.IsEmpty()) {
       result_.set_monitor_bounds(work_area);
       EnumThreadWindows(GetCurrentThreadId(), WindowCallbackProc, as_lparam());
     }
   }
 
   bool CheckPoint(HWND hwnd, int x, int y, DockInfo::Type type) {
     bool in_enable_area;
     if (DockInfo::IsCloseToPoint(screen_loc_, x, y, &in_enable_area)) {
       result_.set_in_enable_area(in_enable_area);
@@ skipping 68 matching lines @@
 
 void DockInfo::SizeOtherWindowTo(const gfx::Rect& bounds) const {
   if (IsZoomed(window())) {
     // We're docking relative to another window, we need to make sure the
     // window we're docking to isn't maximized.
     ShowWindow(window(), SW_RESTORE | SW_SHOWNA);
   }
   SetWindowPos(window(), HWND_TOP, bounds.x(), bounds.y(), bounds.width(),
                bounds.height(), SWP_NOACTIVATE | SWP_NOOWNERZORDER);
 }