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

content/browser/android/content_view_core_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/android/content_view_core_impl.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
@@ skipping 79 matching lines @@
       web_contents_(static_cast<WebContentsImpl*>(web_contents)),
       tab_crashed_(false),
       window_android_(window_android) {
   DCHECK(web_contents) <<
       "A ContentViewCoreImpl should be created with a valid WebContents.";
 
   // TODO(leandrogracia): make use of the hardware_accelerated argument.
 
   InitJNI(env, obj);
 
-  if (!gfx::Screen::IsDIPEnabled()) {
+  if (!gfx::Screen::GetNativeScreen()->IsDIPEnabled()) {
     dpi_scale_ = 1;
   } else {
     scoped_ptr<content::DeviceInfo> device_info(new content::DeviceInfo());
     dpi_scale_ = device_info->GetDPIScale();
   }
 
   notification_registrar_.Add(this,
                               NOTIFICATION_EXECUTE_JAVASCRIPT_RESULT,
                               NotificationService::AllSources());
 
@@ skipping 815 matching lines @@
   if (!HasField(env, clazz, "mNativeContentViewCore", "I")) {
     DLOG(ERROR) << "Unable to find ContentView.mNativeContentViewCore!";
     return false;
   }
   g_native_content_view = GetFieldID(env, clazz, "mNativeContentViewCore", "I");
 
   return RegisterNativesImpl(env) >= 0;
 }
 
 }  // namespace content