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

ui/base/layout.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/base/layout.h"
 
 #include <algorithm>
 #include <cmath>
 #include <limits>
 
@@ skipping 133 matching lines @@
     const std::vector<ui::ScaleFactor>& scale_factors) {
   std::vector<ui::ScaleFactor>& supported_scale_factors =
       GetSupportedScaleFactorsInternal();
   supported_scale_factors = scale_factors;
 }
 
 }  // namespace test
 
 #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;
 }
 #endif  // !defined(OS_MACOSX)
 
 }  // namespace ui