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

ui/base/layout.cc

Index: ui/base/layout.cc
diff --git a/ui/base/layout.cc b/ui/base/layout.cc
index b496fb7ee87386766607147563e64c354b73c6e7..3d2538000ea97215e3aad2446d4dae9ac2779231 100644
--- a/ui/base/layout.cc
+++ b/ui/base/layout.cc
@@ -151,8 +151,9 @@ void SetSupportedScaleFactors(
 
 #if !defined(OS_MACOSX)
 ScaleFactor GetScaleFactorForNativeView(gfx::NativeView view) {
-  if (gfx::Screen::IsDIPEnabled()) {
-    gfx::Display display = gfx::Screen::GetDisplayNearestWindow(view);
+  gfx::Screen* screen = gfx::Screen::GetScreenFor(view);
+  if (screen->IsDIPEnabled()) {
+    gfx::Display display = screen->GetDisplayNearestWindow(view);
     return GetScaleFactorFromScale(display.device_scale_factor());
   }
   return ui::SCALE_FACTOR_100P;