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

ui/views/widget/tooltip_manager_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 "ui/views/widget/tooltip_manager_win.h"
 
 #include <windowsx.h>
 
 #include <limits>
 
@@ skipping 43 matching lines @@
 gfx::Font TooltipManager::GetDefaultFont() {
   static gfx::Font* font = NULL;
   if (!font)
     font = new gfx::Font(DetermineDefaultFont());
   return *font;
 }
 
 // static
 int TooltipManager::GetMaxWidth(int x, int y) {
   gfx::Rect monitor_bounds =
-      gfx::Screen::GetMonitorAreaNearestPoint(gfx::Point(x, y));
+      gfx::Screen::GetMonitorNearestPoint(gfx::Point(x, y)).bounds();
   // Allow the tooltip to be almost as wide as the screen.
   // Otherwise, we would truncate important text, since we're not word-wrapping
   // the text onto multiple lines.
   return monitor_bounds.width() == 0 ? 800 : monitor_bounds.width() - 30;
 }
 
 TooltipManagerWin::TooltipManagerWin(Widget* widget)
     : widget_(widget),
       tooltip_hwnd_(NULL),
       last_mouse_pos_(-1, -1),
@@ skipping 306 matching lines @@
     keyboard_tooltip_hwnd_ = NULL;
   }
 }
 
 void TooltipManagerWin::DestroyKeyboardTooltipWindow(HWND window_to_destroy) {
   if (keyboard_tooltip_hwnd_ == window_to_destroy)
     HideKeyboardTooltip();
 }
 
 }  // namespace views