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

ash/launcher/overflow_bubble.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/launcher/overflow_bubble.h"
 
 #include <algorithm>
 
 #include "ash/launcher/launcher_types.h"
 #include "ash/launcher/launcher_view.h"
+#include "ash/shell.h"
 #include "ui/gfx/insets.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/bubble/bubble_delegate.h"
 #include "ui/views/bubble/bubble_frame_view.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
 namespace internal {
 
 namespace {
@@ skipping 117 matching lines @@
   const gfx::Size contents_size(GetContentsSize());
 
   int y = std::min(contents_size.height() - visible_bounds.height(),
                    std::max(0, scroll_offset_.y() + y_offset));
   scroll_offset_.set_y(y);
 }
 
 gfx::Size OverflowBubbleView::GetPreferredSize() {
   gfx::Size preferred_size = GetContentsSize();
 
-  const gfx::Rect monitor_rect = gfx::Screen::GetDisplayNearestPoint(
+  const gfx::Rect monitor_rect = Shell::GetAshScreen()->GetDisplayNearestPoint(
       GetAnchorRect().CenterPoint()).work_area();
   if (!monitor_rect.IsEmpty()) {
     if (is_horizontal_alignment()) {
       preferred_size.set_width(std::min(
           preferred_size.width(),
           static_cast<int>(monitor_rect.width() *
                            kMaxBubbleSizeToScreenRatio)));
     } else {
       preferred_size.set_height(std::min(
           preferred_size.height(),
@@ skipping 49 matching lines @@
 
   const gfx::Size content_size = GetPreferredSize();
   border->set_arrow_offset(arrow_offset);
 
   const gfx::Rect anchor_rect = GetAnchorRect();
   gfx::Rect bubble_rect = GetBubbleFrameView()->GetUpdatedWindowBounds(
       anchor_rect,
       content_size,
       false);
 
-  gfx::Rect monitor_rect = gfx::Screen::GetDisplayNearestPoint(
+  gfx::Rect monitor_rect = Shell::GetAshScreen()->GetDisplayNearestPoint(
       anchor_rect.CenterPoint()).work_area();
 
   int offset = 0;
   if (views::BubbleBorder::is_arrow_on_horizontal(arrow_location())) {
     if (bubble_rect.x() < monitor_rect.x())
       offset = monitor_rect.x() - bubble_rect.x();
     else if (bubble_rect.right() > monitor_rect.right())
       offset = monitor_rect.right() - bubble_rect.right();
 
     bubble_rect.Offset(offset, 0);
@@ skipping 50 matching lines @@
   bubble_ = NULL;
 }
 
 void OverflowBubble::OnWidgetClosing(views::Widget* widget) {
   DCHECK(widget == bubble_->GetWidget());
   bubble_ = NULL;
 }
 
 }  // namespace internal
 }  // namespace ash