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

ui/views/bubble/bubble_frame_view.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/bubble/bubble_frame_view.h"
 
 #include <algorithm>
 
 #include "ui/gfx/screen.h"
 #include "ui/views/bubble/bubble_border.h"
@@ skipping 79 matching lines @@
     // Try to mirror the anchoring if the bubble does not fit on the screen.
     MirrorArrowIfOffScreen(true, anchor_rect, client_size);
     MirrorArrowIfOffScreen(false, anchor_rect, client_size);
   }
 
   // Calculate the bounds with the arrow in its updated location.
   return bubble_border_->GetBounds(anchor_rect, client_size);
 }
 
 gfx::Rect BubbleFrameView::GetMonitorBounds(const gfx::Rect& rect) {
-  return gfx::Screen::GetMonitorWorkAreaNearestPoint(rect.CenterPoint());
+  return gfx::Screen::GetMonitorNearestPoint(rect.CenterPoint()).work_area();
 }
 
 void BubbleFrameView::MirrorArrowIfOffScreen(
     bool vertical,
     const gfx::Rect& anchor_rect,
     const gfx::Size& client_size) {
   // Check if the bounds don't fit on screen.
   gfx::Rect monitor_rect(GetMonitorBounds(anchor_rect));
   gfx::Rect window_bounds(bubble_border_->GetBounds(anchor_rect, client_size));
   if (GetOffScreenLength(monitor_rect, window_bounds, vertical) > 0) {
     BubbleBorder::ArrowLocation arrow = bubble_border()->arrow_location();
     // Mirror the arrow and get the new bounds.
     bubble_border_->set_arrow_location(
         vertical ? BubbleBorder::vertical_mirror(arrow) :
                    BubbleBorder::horizontal_mirror(arrow));
     gfx::Rect mirror_bounds =
         bubble_border_->GetBounds(anchor_rect, client_size);
     // Restore the original arrow if mirroring doesn't show more of the bubble.
     if (GetOffScreenLength(monitor_rect, mirror_bounds, vertical) >=
         GetOffScreenLength(monitor_rect, window_bounds, vertical))
       bubble_border_->set_arrow_location(arrow);
     else
       SchedulePaint();
   }
 }
 
 }  // namespace views