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

ash/ui_controls_ash.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/shell.h"
 #include "ash/shell_factory.h"
 #include "ash/wm/coordinate_conversion.h"
 #include "ash/wm/window_properties.h"
 #include "ui/aura/client/capture_client.h"
 #include "ui/aura/client/screen_position_client.h"
@@ skipping 89 matching lines @@
       long y,
       const base::Closure& closure) OVERRIDE {
     gfx::Point p(x, y);
     ui_controls::UIControlsAura* ui_controls = GetUIControlsAt(&p);
     return ui_controls &&
         ui_controls->SendMouseMoveNotifyWhenDone(p.x(), p.y(), closure);
   }
 
   virtual bool SendMouseEvents(ui_controls::MouseButton type,
                                int state) OVERRIDE {
-    gfx::Point p(gfx::Screen::GetCursorScreenPoint());
+    gfx::Point p(Shell::GetScreen()->GetCursorScreenPoint());
     ui_controls::UIControlsAura* ui_controls = GetUIControlsAt(&p);
     return ui_controls && ui_controls->SendMouseEvents(type, state);
   }
 
   virtual bool SendMouseEventsNotifyWhenDone(
       ui_controls::MouseButton type,
       int state,
       const base::Closure& closure) OVERRIDE {
-    gfx::Point p(gfx::Screen::GetCursorScreenPoint());
+    gfx::Point p(Shell::GetScreen()->GetCursorScreenPoint());
     ui_controls::UIControlsAura* ui_controls = GetUIControlsAt(&p);
     return ui_controls && ui_controls->SendMouseEventsNotifyWhenDone(
         type, state, closure);
   }
 
   virtual bool SendMouseClick(ui_controls::MouseButton type) OVERRIDE {
-    gfx::Point p(gfx::Screen::GetCursorScreenPoint());
+    gfx::Point p(Shell::GetScreen()->GetCursorScreenPoint());
     ui_controls::UIControlsAura* ui_controls = GetUIControlsAt(&p);
     return ui_controls && ui_controls->SendMouseClick(type);
   }
 
   virtual void RunClosureAfterAllPendingUIEvents(
       const base::Closure& closure) OVERRIDE {
     ui_controls::UIControlsAura* ui_controls = GetUIControlsForRootWindow(
         Shell::GetActiveRootWindow());
     if (ui_controls)
       ui_controls->RunClosureAfterAllPendingUIEvents(closure);
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(UIControlsAsh);
 };
 
 ui_controls::UIControlsAura* CreateUIControls() {
   return new UIControlsAsh();
 }
 
 }  // namespace internal
 }  // namespace ash