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

ash/wm/maximize_bubble_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/wm/maximize_bubble_controller.h"
 
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/window_animations.h"
 #include "ash/wm/workspace/frame_maximize_button.h"
@@ skipping 472 matching lines @@
   DCHECK(bubble_border_);
   bubble_border_->GetMask(mask);
 }
 
 void MaximizeBubbleController::Bubble::MouseMovedOutOfHost() {
   if (!owner_ || shutting_down_)
     return;
   // When we leave the bubble, we might be still be in gesture mode or over
   // the maximize button. So only close if none of the other cases apply.
   if (!owner_->frame_maximize_button()->is_snap_enabled()) {
-    gfx::Point screen_location = gfx::Screen::GetCursorScreenPoint();
+    gfx::Point screen_location = Shell::GetAshScreen()->GetCursorScreenPoint();
     if (!owner_->frame_maximize_button()->GetBoundsInScreen().Contains(
         screen_location)) {
         owner_->RequestDestructionThroughOwner();
     }
   }
 }
 
 bool MaximizeBubbleController::Bubble::Contains(
     const gfx::Point& screen_point,
     views::MouseWatcherHost::MouseEventType type) {
@@ skipping 351 matching lines @@
   if (!GetBoundsInScreen().Contains(screen_location))
     button_row_->ButtonHovered(NULL);
   else
     button_row_->ButtonHovered(this);
 
   // Pass the event on to the normal handler.
   return views::ImageButton::OnMouseDragged(event);
 }
 
 }  // namespace ash