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

ui/views/drag_utils.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/views/drag_utils.h"
 
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/size.h"
 
 #if defined(USE_AURA)
@@ skipping 11 matching lines @@
 #error
 #endif
 
 ui::ScaleFactor GetDeviceScaleFactorForNativeView(views::Widget* widget) {
   ui::ScaleFactor device_scale_factor = ui::SCALE_FACTOR_100P;
 #if defined(USE_AURA)
   // The following code should work on other platforms as well. But we do not
   // yet care about device scale factor on other platforms. So to keep drag and
   // drop behavior on other platforms un-touched, we wrap this in the #if guard.
   if (widget && widget->GetNativeView()) {
-    gfx::Display display = gfx::Screen::GetDisplayNearestWindow(
-        widget->GetNativeView());
+    gfx::NativeView view = widget->GetNativeView();
+    gfx::Display display = gfx::Screen::GetScreenFor(view)->
+        GetDisplayNearestWindow(view);
     device_scale_factor = ui::GetScaleFactorFromScale(
         display.device_scale_factor());
   }
 #endif
   return device_scale_factor;
 }
 
 namespace views {
 
 void RunShellDrag(gfx::NativeView view,
@@ skipping 19 matching lines @@
 }
 
 gfx::Canvas* GetCanvasForDragImage(views::Widget* widget,
                                    const gfx::Size& canvas_size) {
   ui::ScaleFactor device_scale_factor =
       GetDeviceScaleFactorForNativeView(widget);
   return new gfx::Canvas(canvas_size, device_scale_factor, false);
 }
 
 }  // namespace views