Revert "[NTP::Downloads] Replace 36dp ... resources with vector ... ."

chrome/android/java/src/org/chromium/chrome/browser/download/DownloadUtils.java

Index: chrome/android/java/src/org/chromium/chrome/browser/download/DownloadUtils.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadUtils.java
index 5be08cc39d8e74087fc8d0a6f9dccdad0e112131..bb41d29d7ac21385005f8feebc6c663953cd33f6 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadUtils.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadUtils.java
@@ -16,6 +16,7 @@ import android.graphics.Color;
 import android.net.Uri;
 import android.os.StrictMode;
 import android.provider.Browser;
+import android.support.annotation.IntDef;
 import android.support.annotation.Nullable;
 import android.support.customtabs.CustomTabsIntent;
 import android.text.TextUtils;
@@ -51,6 +52,8 @@ import org.chromium.ui.base.DeviceFormFactor;
 import org.chromium.ui.widget.Toast;
 
 import java.io.File;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
 import java.text.NumberFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -88,6 +91,16 @@ public class DownloadUtils {
     static final String ELLIPSIS = "\u2026";
 
     /**
+     * Possible sizes of type-based icons.
+     */
+    @IntDef({ICON_SIZE_24_DP, ICON_SIZE_36_DP})
+    @Retention(RetentionPolicy.SOURCE)
+    public @interface IconSize {}
+
+    public static final int ICON_SIZE_24_DP = 24;
+    public static final int ICON_SIZE_36_DP = 36;
+
+    /**
      * Displays the download manager UI. Note the UI is different on tablets and on phones.
      * @return Whether the UI was shown.
      */
@@ -683,21 +696,29 @@ public class DownloadUtils {
     /**
      * Return an icon for a given file type.
      * @param fileType Type of the file as returned by DownloadFilter.
+     * @param iconSize Size of the returned icon.
+     * @return Resource ID of the corresponding icon.
      */
-    public static int getIconResId(int fileType) {
+    public static int getIconResId(int fileType, @IconSize int iconSize) {
         switch (fileType) {
             case DownloadFilter.FILTER_PAGE:
-                return R.drawable.ic_drive_site_white;
+                return iconSize == ICON_SIZE_24_DP ? R.drawable.ic_drive_site_white_24dp
+                                                   : R.drawable.ic_drive_site_white_36dp;
             case DownloadFilter.FILTER_VIDEO:
-                return R.drawable.ic_play_arrow_white;
+                return iconSize == ICON_SIZE_24_DP ? R.drawable.ic_play_arrow_white_24dp
+                                                   : R.drawable.ic_play_arrow_white_36dp;
             case DownloadFilter.FILTER_AUDIO:
-                return R.drawable.ic_music_note_white;
+                return iconSize == ICON_SIZE_24_DP ? R.drawable.ic_music_note_white_24dp
+                                                   : R.drawable.ic_music_note_white_36dp;
             case DownloadFilter.FILTER_IMAGE:
-                return R.drawable.ic_image_white;
+                return iconSize == ICON_SIZE_24_DP ? R.drawable.ic_image_white_24dp
+                                                   : R.drawable.ic_image_white_36dp;
             case DownloadFilter.FILTER_DOCUMENT:
-                return R.drawable.ic_drive_text_white;
+                return iconSize == ICON_SIZE_24_DP ? R.drawable.ic_drive_text_white_24dp
+                                                   : R.drawable.ic_drive_text_white_36dp;
             default:
-                return R.drawable.ic_drive_file_white;
+                return iconSize == ICON_SIZE_24_DP ? R.drawable.ic_drive_file_white_24dp
+                                                   : R.drawable.ic_drive_text_white_36dp;
         }
     }