Add context to gfx::Screen calls in support of simultaneous desktop+ash

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 84 matching lines @@
 
 void BubbleFrameView::SetBubbleBorder(BubbleBorder* border) {
   bubble_border_ = border;
   set_border(bubble_border_);
 
   // Update the background, which relies on the border.
   set_background(new views::BubbleBackground(border));
 }
 
 gfx::Rect BubbleFrameView::GetMonitorBounds(const gfx::Rect& rect) {
-  return gfx::Screen::GetDisplayNearestPoint(rect.CenterPoint()).work_area();
+  // TODO(scottmg): Native is wrong. http://crbug.com/133312
+  return gfx::Screen::GetNativeScreen()->GetDisplayNearestPoint(
+      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) {
@@ skipping 45 matching lines @@
   // |offscreen_adjust|, e.g. positive |offscreen_adjust| means bubble
   // window needs to be moved to the right and that means we need to move arrow
   // to the left, and that means negative offset.
   bubble_border_->set_arrow_offset(
       bubble_border_->GetArrowOffset(window_bounds.size()) - offscreen_adjust);
   if (offscreen_adjust)
     SchedulePaint();
 }
 
 }  // namespace views