| Index: ui/android/java/src/org/chromium/ui/resources/ResourceManager.java
|
| diff --git a/ui/android/java/src/org/chromium/ui/resources/ResourceManager.java b/ui/android/java/src/org/chromium/ui/resources/ResourceManager.java
|
| index 5b77c074519954533d710e522e869858e6484230..9a8f1dc5b8b6750581c7120729a8411008c1a71a 100644
|
| --- a/ui/android/java/src/org/chromium/ui/resources/ResourceManager.java
|
| +++ b/ui/android/java/src/org/chromium/ui/resources/ResourceManager.java
|
| @@ -14,7 +14,7 @@ import org.chromium.base.annotations.CalledByNative;
|
| import org.chromium.base.annotations.JNINamespace;
|
| import org.chromium.base.annotations.MainDex;
|
| import org.chromium.ui.base.WindowAndroid;
|
| -import org.chromium.ui.gfx.DeviceDisplayInfo;
|
| +import org.chromium.ui.display.DisplayAndroid;
|
| import org.chromium.ui.resources.ResourceLoader.ResourceLoaderCallback;
|
| import org.chromium.ui.resources.dynamics.DynamicResource;
|
| import org.chromium.ui.resources.dynamics.DynamicResourceLoader;
|
| @@ -73,13 +73,13 @@ public class ResourceManager implements ResourceLoaderCallback {
|
| throw new IllegalStateException("Context should not be null during initialization.");
|
| }
|
|
|
| - DeviceDisplayInfo displayInfo = DeviceDisplayInfo.create(context);
|
| - int screenWidth = displayInfo.getPhysicalDisplayWidth() != 0
|
| - ? displayInfo.getPhysicalDisplayWidth()
|
| - : displayInfo.getDisplayWidth();
|
| - int screenHeight = displayInfo.getPhysicalDisplayHeight() != 0
|
| - ? displayInfo.getPhysicalDisplayHeight()
|
| - : displayInfo.getDisplayHeight();
|
| + DisplayAndroid displayAndroid = windowAndroid.getDisplay();
|
| + int screenWidth = displayAndroid.getPhysicalDisplayWidth() != 0
|
| + ? displayAndroid.getPhysicalDisplayWidth()
|
| + : displayAndroid.getDisplayWidth();
|
| + int screenHeight = displayAndroid.getPhysicalDisplayHeight() != 0
|
| + ? displayAndroid.getPhysicalDisplayHeight()
|
| + : displayAndroid.getDisplayHeight();
|
| int minScreenSideLength = Math.min(screenWidth, screenHeight);
|
|
|
| Resources resources = context.getResources();
|
|
|