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

chrome/browser/ui/views/fullscreen_exit_bubble_views.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 "chrome/browser/ui/views/fullscreen_exit_bubble_views.h"
 
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "googleurl/src/gurl.h"
@@ skipping 322 matching lines @@
 void FullscreenExitBubbleViews::AnimationEnded(
     const ui::Animation* animation) {
   AnimationProgressed(animation);
 }
 
 gfx::Rect FullscreenExitBubbleViews::GetPopupRect(
     bool ignore_animation_state) const {
   gfx::Size size(view_->GetPreferredSize());
   // NOTE: don't use the bounds of the root_view_. On linux changing window
   // size is async. Instead we use the size of the screen.
-  gfx::Rect screen_bounds = gfx::Screen::GetDisplayNearestWindow(
+  gfx::Screen* screen =
+      gfx::Screen::GetScreenFor(root_view_->GetWidget()->GetNativeView());
+  gfx::Rect screen_bounds = screen->GetDisplayNearestWindow(
       root_view_->GetWidget()->GetNativeView()).bounds();
   gfx::Point origin(screen_bounds.x() +
                     (screen_bounds.width() - size.width()) / 2,
                     kPopupTopPx + screen_bounds.y());
   if (!ignore_animation_state) {
     int total_height = size.height() + kPopupTopPx;
     int popup_bottom = size_animation_->CurrentValueBetween(
         static_cast<double>(total_height), 0.0f);
     int y_offset = std::min(popup_bottom, kPopupTopPx);
     size.set_height(size.height() - popup_bottom + y_offset);
     origin.set_y(origin.y() - y_offset);
   }
   return gfx::Rect(origin, size);
 }
 
 gfx::Point FullscreenExitBubbleViews::GetCursorScreenPoint() {
-  gfx::Point cursor_pos = gfx::Screen::GetCursorScreenPoint();
+  gfx::Point cursor_pos = gfx::Screen::GetScreenFor(
+      root_view_->GetWidget()->GetNativeView())->GetCursorScreenPoint();
   views::View::ConvertPointToTarget(NULL, root_view_, &cursor_pos);
   return cursor_pos;
 }
 
 bool FullscreenExitBubbleViews::WindowContainsPoint(gfx::Point pos) {
   return root_view_->HitTestPoint(pos);
 }
 
 bool FullscreenExitBubbleViews::IsWindowActive() {
   return root_view_->GetWidget()->IsActive();
@@ skipping 10 matching lines @@
 }
 
 bool FullscreenExitBubbleViews::IsAnimating() {
   return size_animation_->GetCurrentValue() != 0;
 }
 
 void FullscreenExitBubbleViews::StartWatchingMouseIfNecessary() {
   if (!fullscreen_bubble::ShowButtonsForType(bubble_type_))
     StartWatchingMouse();
 }