android: Use DisplayAndroid in explore_sites

Bug: 1042063
Change-Id: I389cc648f31e65fe24e57de611be610d99091e56
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2012524Reviewed-by: Cathy Li <chili@chromium.org>
Commit-Queue: Bo <boliu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#733764}

chrome/android/java/src/org/chromium/chrome/browser/explore_sites/ExperimentalExploreSitesSection.java

@@ -4,12 +4,9 @@
 
 package org.chromium.chrome.browser.explore_sites;
 
-import android.content.Context;
 import android.graphics.Bitmap;
-import android.graphics.Point;
 import android.view.LayoutInflater;
 import android.view.View;
-import android.view.WindowManager;
 import android.widget.LinearLayout;
 
 import org.chromium.chrome.R;
@@ -17,6 +14,7 @@ import org.chromium.chrome.browser.native_page.NativePageNavigationDelegate;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.content_public.browser.LoadUrlParams;
 import org.chromium.ui.base.PageTransition;
+import org.chromium.ui.display.DisplayAndroid;
 import org.chromium.ui.mojom.WindowOpenDisposition;
 
 import java.util.List;
@@ -61,11 +59,9 @@ public class ExperimentalExploreSitesSection {
         // TODO(chili): Try to get this from view hierarchy. This gets called before the
         // mExploreSection is measured when opening ntp via 3 dot menu -> new tab,
         // causing a crash. Max width is set to tile grid max width.
-        Point screenSize = new Point();
-        ((WindowManager) mExploreSection.getContext().getSystemService(Context.WINDOW_SERVICE))
-                .getDefaultDisplay()
-                .getSize(screenSize);
-        int tileWidth = Math.min(screenSize.x,
+        int width =
+                DisplayAndroid.getNonMultiDisplay(mExploreSection.getContext()).getDisplayWidth();
+        int tileWidth = Math.min(width,
                                 mExploreSection.getResources().getDimensionPixelSize(
                                         R.dimen.tile_grid_layout_max_width))
                 / MAX_TILES;

chrome/android/java/src/org/chromium/chrome/browser/explore_sites/ExploreSitesBridge.java

@@ -4,10 +4,7 @@
 
 package org.chromium.chrome.browser.explore_sites;
 
-import android.content.Context;
 import android.graphics.Bitmap;
-import android.util.DisplayMetrics;
-import android.view.WindowManager;
 
 import org.chromium.base.Callback;
 import org.chromium.base.ContextUtils;
@@ -15,6 +12,7 @@ import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNINamespace;
 import org.chromium.base.annotations.NativeMethods;
 import org.chromium.chrome.browser.profiles.Profile;
+import org.chromium.ui.display.DisplayAndroid;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -154,14 +152,8 @@ public class ExploreSitesBridge {
      */
     @CalledByNative
     static float getScaleFactorFromDevice() {
-        // Get DeviceMetrics from context.
-        DisplayMetrics metrics = new DisplayMetrics();
-        ((WindowManager) ContextUtils.getApplicationContext().getSystemService(
-                 Context.WINDOW_SERVICE))
-                .getDefaultDisplay()
-                .getMetrics(metrics);
-        // Get density and return it.
-        return metrics.density;
+        return DisplayAndroid.getNonMultiDisplay(ContextUtils.getApplicationContext())
+                .getDipScale();
     }
 
     @NativeMethods