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

content/browser/web_contents/web_contents_impl.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 "content/browser/web_contents/web_contents_impl.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
@@ skipping 648 matching lines @@
   if (command_line.HasSwitch(switches::kDefaultTileHeight))
     prefs.default_tile_height =
         GetSwitchValueAsInt(command_line, switches::kDefaultTileHeight, 1);
   if (command_line.HasSwitch(switches::kMaxUntiledLayerWidth))
     prefs.max_untiled_layer_width =
         GetSwitchValueAsInt(command_line, switches::kMaxUntiledLayerWidth, 1);
   if (command_line.HasSwitch(switches::kMaxUntiledLayerHeight))
     prefs.max_untiled_layer_height =
         GetSwitchValueAsInt(command_line, switches::kMaxUntiledLayerHeight, 1);
 
-  if (gfx::Screen::IsDIPEnabled()) {
+  // TODO(scottmg): Probably Native is wrong: http://crbug.com/133312
+  if (gfx::Screen::GetNativeScreen()->IsDIPEnabled()) {
     // Only apply when using DIP coordinate system as this setting interferes
     // with fixed layout mode.
     prefs.apply_default_device_scale_factor_in_compositor = true;
   }
 
   prefs.fixed_position_creates_stacking_context = !command_line.HasSwitch(
       switches::kDisableFixedPositionCreatesStackingContext);
 
   prefs.gesture_tap_highlight_enabled = command_line.HasSwitch(
       switches::kEnableGestureTapHighlight);
@@ skipping 2735 matching lines @@
   }
 }
 
 content::BrowserPluginGuest* WebContentsImpl::GetBrowserPluginGuest() {
   return browser_plugin_guest_.get();
 }
 
 content::BrowserPluginEmbedder* WebContentsImpl::GetBrowserPluginEmbedder() {
   return browser_plugin_embedder_.get();
 }