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

ash/ui_controls_ash.cc

Index: ash/ui_controls_ash.cc
diff --git a/ash/ui_controls_ash.cc b/ash/ui_controls_ash.cc
index f2aba71303c98c5f9995eb7f1b2d42515b3ae8d7..c3e8b0b5a71d0e09ada7fb7d9de0def2ed22f6e4 100644
--- a/ash/ui_controls_ash.cc
+++ b/ash/ui_controls_ash.cc
@@ -107,7 +107,7 @@ class UIControlsAsh : public ui_controls::UIControlsAura {
 
   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);
   }
@@ -116,14 +116,14 @@ class UIControlsAsh : public ui_controls::UIControlsAura {
       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);
   }