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

ash/tooltips/tooltip_controller.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/tooltips/tooltip_controller.h"
 
 #include <vector>
 
 #include "ash/ash_switches.h"
 #include "ash/shell.h"
@@ skipping 47 matching lines @@
   // TODO(varunjain): implementation duplicated in tooltip_manager_aura. Figure
   // out a way to merge.
   return ui::ResourceBundle::GetSharedInstance().GetFont(
       ui::ResourceBundle::BaseFont);
 }
 
 int GetMaxWidth(int x, int y) {
   // TODO(varunjain): implementation duplicated in tooltip_manager_aura. Figure
   // out a way to merge.
   gfx::Rect monitor_bounds =
-      gfx::Screen::GetMonitorAreaNearestPoint(gfx::Point(x, y));
+      gfx::Screen::GetMonitorNearestPoint(gfx::Point(x, y)).bounds();
   return (monitor_bounds.width() + 1) / 2;
 }
 
 // Creates a widget of type TYPE_TOOLTIP
 views::Widget* CreateTooltip() {
   views::Widget* widget = new views::Widget;
   views::Widget::InitParams params;
   // For aura, since we set the type to TOOLTIP_TYPE, the widget will get
   // auto-parented to the MenuAndTooltipsContainer.
   params.type = views::Widget::InitParams::TYPE_TOOLTIP;
@@ skipping 69 matching lines @@
   // Adjusts the bounds given by the arguments to fit inside the desktop
   // and applies the adjusted bounds to the label_.
   void SetTooltipBounds(gfx::Point mouse_pos,
                         int tooltip_width,
                         int tooltip_height) {
     gfx::Rect tooltip_rect(mouse_pos.x(), mouse_pos.y(), tooltip_width,
                            tooltip_height);
 
     tooltip_rect.Offset(kCursorOffsetX, kCursorOffsetY);
     gfx::Rect monitor_bounds =
-        gfx::Screen::GetMonitorAreaNearestPoint(tooltip_rect.origin());
+        gfx::Screen::GetMonitorNearestPoint(tooltip_rect.origin()).bounds();
 
     // If tooltip is out of bounds on the x axis, we simply shift it
     // horizontally by the offset.
     if (tooltip_rect.right() > monitor_bounds.right()) {
       int h_offset = tooltip_rect.right() - monitor_bounds.right();
       tooltip_rect.Offset(-h_offset, 0);
     }
 
     // If tooltip is out of bounds on the y axis, we flip it to appear above the
     // mouse cursor instead of below.
@@ skipping 251 matching lines @@
 bool TooltipController::IsDragDropInProgress() {
   aura::client::DragDropClient* client = aura::client::GetDragDropClient(
       Shell::GetRootWindow());
   if (client)
     return client->IsDragDropInProgress();
   return false;
 }
 
 }  // namespace internal
 }  // namespace ash