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

ui/aura/root_window_host_linux.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 "ui/aura/root_window_host_linux.h"
 
 #include <X11/cursorfont.h>
 #include <X11/extensions/Xfixes.h>
 #include <X11/extensions/XInput2.h>
 #include <X11/extensions/Xrandr.h>
@@ skipping 469 matching lines @@
       bool origin_changed = bounds_.origin() != bounds.origin();
       bounds_ = bounds;
       // Always update barrier and mouse location because |bounds_| might
       // have already been updated in |SetBounds|.
       if (pointer_barriers_.get()) {
         UnConfineCursor();
         RootWindow* root = delegate_->AsRootWindow();
         client::ScreenPositionClient* client =
             client::GetScreenPositionClient(root);
         if (client) {
-          gfx::Point p = gfx::Screen::GetCursorScreenPoint();
+          gfx::Point p = gfx::Screen::GetScreenFor(root)->
+              GetCursorScreenPoint();
           client->ConvertPointFromScreen(root, &p);
           if (root->ContainsPoint(p)) {
             root->ConvertPointToNativeScreen(&p);
             XWarpPointer(
                 xdisplay_, None, x_root_window_, 0, 0, 0, 0, p.x(), p.y());
           }
         }
         ConfineCursorToRootWindow();
       }
       if (size_changed)
@@ skipping 235 matching lines @@
 }
 
 gfx::Rect RootWindowHostLinux::GetBounds() const {
   return bounds_;
 }
 
 void RootWindowHostLinux::SetBounds(const gfx::Rect& bounds) {
   // Even if the host window's size doesn't change, aura's root window
   // size, which is in DIP, changes when the scale changes.
   float current_scale = delegate_->GetDeviceScaleFactor();
-  float new_scale = gfx::Screen::GetDisplayNearestWindow(
-      delegate_->AsRootWindow()).device_scale_factor();
+  float new_scale = gfx::Screen::GetScreenFor(delegate_->AsRootWindow())->
+      GetDisplayNearestWindow(delegate_->AsRootWindow()).device_scale_factor();
   bool origin_changed = bounds_.origin() != bounds.origin();
   bool size_changed = bounds_.size() != bounds.size();
   XWindowChanges changes = {0};
   unsigned value_mask = 0;
 
   if (size_changed) {
     changes.width = bounds.width();
     changes.height = bounds.height();
     value_mask = CWHeight | CWWidth;
   }
@@ skipping 252 matching lines @@
   return new RootWindowHostLinux(bounds);
 }
 
 // static
 gfx::Size RootWindowHost::GetNativeScreenSize() {
   ::Display* xdisplay = base::MessagePumpAuraX11::GetDefaultXDisplay();
   return gfx::Size(DisplayWidth(xdisplay, 0), DisplayHeight(xdisplay, 0));
 }
 
 }  // namespace aura