Add filetype icon resources for launcher search result.

Previously, Files.app used filetype icons which is prepared to show icons in list/grid view.
However, the resolution is not enough for app launcher search result and it is shown as blurry icon in high-dpi devices.
This CL adds larger icon size resources for app launcher search result.

BUG=490597
TEST=manually tested.

Review URL: https://codereview.chromium.org/1163973006

Cr-Commit-Position: refs/heads/master@{#333248}

tools/gritsettings/resource_ids

@@ -219,37 +219,37 @@
     "includes": [28110],
   },
   "components/chrome_apps/chrome_apps_resources.grd": {
-    "includes": [28270],
+    "includes": [28290],
   },
   "ui/login/login_resources.grd": {
-    "includes": [28300],
-  },
-  "ui/oobe/oobe_resources.grd": {
     "includes": [28310],
   },
+  "ui/oobe/oobe_resources.grd": {
+    "includes": [28320],
+  },
   "chrome/browser/resources/translate_internals_resources.grd": {
-    "includes": [28500],
+    "includes": [28510],
   },
   "chrome/browser/resources/sync_file_system_internals_resources.grd": {
-    "includes": [29000],
+    "includes": [29010],
   },
   "chrome/app/address_input_strings.grd": {
-    "messages": [29100],
+    "messages": [29110],
   },
   "remoting/resources/remoting_strings.grd": {
-    "messages": [29550],
+    "messages": [29560],
   },
   "components/components_strings.grd": {
-    "messages": [30000],
+    "messages": [30010],
   },
   "components/resources/components_resources.grd": {
-    "includes": [30250],
+    "includes": [30260],
   },
   "components/resources/components_scaled_resources.grd": {
-    "structures": [30300],
+    "structures": [30310],
   },
   "components/resources/enhanced_bookmarks/enhanced_bookmarks_resources.grd": {
-    "includes": [30330],
+    "includes": [30340],
   },
   "third_party/WebKit/public/blink_resources.grd": {
     "includes": [30350],

ui/file_manager/file_manager/background/js/launcher_search.js

@@ -118,14 +118,19 @@ LauncherSearch.prototype.onQueryStarted_ = function(queryId, query, limit) {
         chrome.launcherSearchProvider.setSearchResults(
             queryId,
             results.map(function(result) {
-              // Use high-dpi icons since preferred icon size is 24px in the
-              // current implementation.
-              //
               // TODO(yawano): Use filetype_folder_shared.png for a shared
               //     folder.
+              // TODO(yawano): Add archive launcher filetype icon.
+              var fileType = FileType.getIcon(result.entry);
+              if (fileType === 'UNKNOWN' || fileType === 'archive')
+                fileType = 'generic';
+
+              var useHighDpiIcon = window.devicePixelRatio > 1.0;
               var iconUrl = chrome.runtime.getURL(
-                  'foreground/images/filetype/2x/filetype_' +
-                  FileType.getIcon(result.entry) + '.png');
+                  'foreground/images/launcher_filetypes/' +
+                  (useHighDpiIcon ? '2x/' : '') + 'launcher_filetype_' +
+                  fileType + '.png');
+
               return {
                 itemId: result.entry.toURL(),
                 title: result.entry.name,

ui/file_manager/file_manager_resources.grd

@@ -84,26 +84,44 @@
       <include name="IDR_FILE_MANAGER_GALLERY_ICON_256" file="gallery/images/icon256.png" type="BINDATA" />
 
       <!-- Resources used for file type icon in launcher search result. -->
-      <include name="IDR_FILE_MANAGER_IMG_FILETYPE_2X_ARCHIVE" file="file_manager/foreground/images/filetype/2x/filetype_archive.png" type="BINDATA" />
-      <include name="IDR_FILE_MANAGER_IMG_FILETYPE_2X_AUDIO" file="file_manager/foreground/images/filetype/2x/filetype_audio.png" type="BINDATA" />
-      <include name="IDR_FILE_MANAGER_IMG_FILETYPE_2X_CHART" file="file_manager/foreground/images/filetype/2x/filetype_chart.png" type="BINDATA" />
-      <include name="IDR_FILE_MANAGER_IMG_FILETYPE_2X_EXCEL" file="file_manager/foreground/images/filetype/2x/filetype_excel.png" type="BINDATA" />
-      <include name="IDR_FILE_MANAGER_IMG_FILETYPE_2X_FOLDER" file="file_manager/foreground/images/filetype/2x/filetype_folder.png" type="BINDATA" />
-      <include name="IDR_FILE_MANAGER_IMG_FILETYPE_2X_FORM" file="file_manager/foreground/images/filetype/2x/filetype_form.png" type="BINDATA" />
-      <include name="IDR_FILE_MANAGER_IMG_FILETYPE_2X_GDOC" file="file_manager/foreground/images/filetype/2x/filetype_gdoc.png" type="BINDATA" />
-      <include name="IDR_FILE_MANAGER_IMG_FILETYPE_2X_GDRAW" file="file_manager/foreground/images/filetype/2x/filetype_gdraw.png" type="BINDATA" />
-      <include name="IDR_FILE_MANAGER_IMG_FILETYPE_2X_GENERIC" file="file_manager/foreground/images/filetype/2x/filetype_generic.png" type="BINDATA" />
-      <include name="IDR_FILE_MANAGER_IMG_FILETYPE_2X_GSHEET" file="file_manager/foreground/images/filetype/2x/filetype_gsheet.png" type="BINDATA" />
-      <include name="IDR_FILE_MANAGER_IMG_FILETYPE_2X_GSLIDES" file="file_manager/foreground/images/filetype/2x/filetype_gslides.png" type="BINDATA" />
-      <include name="IDR_FILE_MANAGER_IMG_FILETYPE_2X_GTABLE" file="file_manager/foreground/images/filetype/2x/filetype_gtable.png" type="BINDATA" />
-      <include name="IDR_FILE_MANAGER_IMG_FILETYPE_2X_IMAGE" file="file_manager/foreground/images/filetype/2x/filetype_image.png" type="BINDATA" />
-      <include name="IDR_FILE_MANAGER_IMG_FILETYPE_2X_MAP" file="file_manager/foreground/images/filetype/2x/filetype_map.png" type="BINDATA" />
-      <include name="IDR_FILE_MANAGER_IMG_FILETYPE_2X_PDF" file="file_manager/foreground/images/filetype/2x/filetype_pdf.png" type="BINDATA" />
-      <include name="IDR_FILE_MANAGER_IMG_FILETYPE_2X_PPT" file="file_manager/foreground/images/filetype/2x/filetype_ppt.png" type="BINDATA" />
-      <include name="IDR_FILE_MANAGER_IMG_FILETYPE_2X_SCRIPT" file="file_manager/foreground/images/filetype/2x/filetype_script.png" type="BINDATA" />
-      <include name="IDR_FILE_MANAGER_IMG_FILETYPE_2X_SITES" file="file_manager/foreground/images/filetype/2x/filetype_sites.png" type="BINDATA" />
-      <include name="IDR_FILE_MANAGER_IMG_FILETYPE_2X_VIDEO" file="file_manager/foreground/images/filetype/2x/filetype_video.png" type="BINDATA" />
-      <include name="IDR_FILE_MANAGER_IMG_FILETYPE_2X_WORD" file="file_manager/foreground/images/filetype/2x/filetype_word.png" type="BINDATA" />
+      <include name="IDR_FILE_MANAGER_IMG_LAUNCHER_FILETYPE_AUDIO" file="file_manager/foreground/images/launcher_filetypes/launcher_filetype_audio.png" type="BINDATA" />
+      <include name="IDR_FILE_MANAGER_IMG_LAUNCHER_FILETYPE_CHART" file="file_manager/foreground/images/launcher_filetypes/launcher_filetype_chart.png" type="BINDATA" />
+      <include name="IDR_FILE_MANAGER_IMG_LAUNCHER_FILETYPE_EXCEL" file="file_manager/foreground/images/launcher_filetypes/launcher_filetype_excel.png" type="BINDATA" />
+      <include name="IDR_FILE_MANAGER_IMG_LAUNCHER_FILETYPE_FOLDER" file="file_manager/foreground/images/launcher_filetypes/launcher_filetype_folder.png" type="BINDATA" />
+      <include name="IDR_FILE_MANAGER_IMG_LAUNCHER_FILETYPE_FORM" file="file_manager/foreground/images/launcher_filetypes/launcher_filetype_form.png" type="BINDATA" />
+      <include name="IDR_FILE_MANAGER_IMG_LAUNCHER_FILETYPE_GDOC" file="file_manager/foreground/images/launcher_filetypes/launcher_filetype_gdoc.png" type="BINDATA" />
+      <include name="IDR_FILE_MANAGER_IMG_LAUNCHER_FILETYPE_GDRAW" file="file_manager/foreground/images/launcher_filetypes/launcher_filetype_gdraw.png" type="BINDATA" />
+      <include name="IDR_FILE_MANAGER_IMG_LAUNCHER_FILETYPE_GENERIC" file="file_manager/foreground/images/launcher_filetypes/launcher_filetype_generic.png" type="BINDATA" />
+      <include name="IDR_FILE_MANAGER_IMG_LAUNCHER_FILETYPE_GSHEET" file="file_manager/foreground/images/launcher_filetypes/launcher_filetype_gsheet.png" type="BINDATA" />
+      <include name="IDR_FILE_MANAGER_IMG_LAUNCHER_FILETYPE_GSLIDES" file="file_manager/foreground/images/launcher_filetypes/launcher_filetype_gslides.png" type="BINDATA" />
+      <include name="IDR_FILE_MANAGER_IMG_LAUNCHER_FILETYPE_GTABLE" file="file_manager/foreground/images/launcher_filetypes/launcher_filetype_gtable.png" type="BINDATA" />
+      <include name="IDR_FILE_MANAGER_IMG_LAUNCHER_FILETYPE_IMAGE" file="file_manager/foreground/images/launcher_filetypes/launcher_filetype_image.png" type="BINDATA" />
+      <include name="IDR_FILE_MANAGER_IMG_LAUNCHER_FILETYPE_MAP" file="file_manager/foreground/images/launcher_filetypes/launcher_filetype_map.png" type="BINDATA" />
+      <include name="IDR_FILE_MANAGER_IMG_LAUNCHER_FILETYPE_PDF" file="file_manager/foreground/images/launcher_filetypes/launcher_filetype_pdf.png" type="BINDATA" />
+      <include name="IDR_FILE_MANAGER_IMG_LAUNCHER_FILETYPE_PPT" file="file_manager/foreground/images/launcher_filetypes/launcher_filetype_ppt.png" type="BINDATA" />
+      <include name="IDR_FILE_MANAGER_IMG_LAUNCHER_FILETYPE_SCRIPT" file="file_manager/foreground/images/launcher_filetypes/launcher_filetype_script.png" type="BINDATA" />
+      <include name="IDR_FILE_MANAGER_IMG_LAUNCHER_FILETYPE_SITES" file="file_manager/foreground/images/launcher_filetypes/launcher_filetype_sites.png" type="BINDATA" />
+      <include name="IDR_FILE_MANAGER_IMG_LAUNCHER_FILETYPE_VIDEO" file="file_manager/foreground/images/launcher_filetypes/launcher_filetype_video.png" type="BINDATA" />
+      <include name="IDR_FILE_MANAGER_IMG_LAUNCHER_FILETYPE_WORD" file="file_manager/foreground/images/launcher_filetypes/launcher_filetype_word.png" type="BINDATA" />
+      <include name="IDR_FILE_MANAGER_IMG_LAUNCHER_FILETYPE_2X_AUDIO" file="file_manager/foreground/images/launcher_filetypes/2x/launcher_filetype_audio.png" type="BINDATA" />
+      <include name="IDR_FILE_MANAGER_IMG_LAUNCHER_FILETYPE_2X_CHART" file="file_manager/foreground/images/launcher_filetypes/2x/launcher_filetype_chart.png" type="BINDATA" />
+      <include name="IDR_FILE_MANAGER_IMG_LAUNCHER_FILETYPE_2X_EXCEL" file="file_manager/foreground/images/launcher_filetypes/2x/launcher_filetype_excel.png" type="BINDATA" />
+      <include name="IDR_FILE_MANAGER_IMG_LAUNCHER_FILETYPE_2X_FOLDER" file="file_manager/foreground/images/launcher_filetypes/2x/launcher_filetype_folder.png" type="BINDATA" />
+      <include name="IDR_FILE_MANAGER_IMG_LAUNCHER_FILETYPE_2X_FORM" file="file_manager/foreground/images/launcher_filetypes/2x/launcher_filetype_form.png" type="BINDATA" />
+      <include name="IDR_FILE_MANAGER_IMG_LAUNCHER_FILETYPE_2X_GDOC" file="file_manager/foreground/images/launcher_filetypes/2x/launcher_filetype_gdoc.png" type="BINDATA" />
+      <include name="IDR_FILE_MANAGER_IMG_LAUNCHER_FILETYPE_2X_GDRAW" file="file_manager/foreground/images/launcher_filetypes/2x/launcher_filetype_gdraw.png" type="BINDATA" />
+      <include name="IDR_FILE_MANAGER_IMG_LAUNCHER_FILETYPE_2X_GENERIC" file="file_manager/foreground/images/launcher_filetypes/2x/launcher_filetype_generic.png" type="BINDATA" />
+      <include name="IDR_FILE_MANAGER_IMG_LAUNCHER_FILETYPE_2X_GSHEET" file="file_manager/foreground/images/launcher_filetypes/2x/launcher_filetype_gsheet.png" type="BINDATA" />
+      <include name="IDR_FILE_MANAGER_IMG_LAUNCHER_FILETYPE_2X_GSLIDES" file="file_manager/foreground/images/launcher_filetypes/2x/launcher_filetype_gslides.png" type="BINDATA" />
+      <include name="IDR_FILE_MANAGER_IMG_LAUNCHER_FILETYPE_2X_GTABLE" file="file_manager/foreground/images/launcher_filetypes/2x/launcher_filetype_gtable.png" type="BINDATA" />
+      <include name="IDR_FILE_MANAGER_IMG_LAUNCHER_FILETYPE_2X_IMAGE" file="file_manager/foreground/images/launcher_filetypes/2x/launcher_filetype_image.png" type="BINDATA" />
+      <include name="IDR_FILE_MANAGER_IMG_LAUNCHER_FILETYPE_2X_MAP" file="file_manager/foreground/images/launcher_filetypes/2x/launcher_filetype_map.png" type="BINDATA" />
+      <include name="IDR_FILE_MANAGER_IMG_LAUNCHER_FILETYPE_2X_PDF" file="file_manager/foreground/images/launcher_filetypes/2x/launcher_filetype_pdf.png" type="BINDATA" />
+      <include name="IDR_FILE_MANAGER_IMG_LAUNCHER_FILETYPE_2X_PPT" file="file_manager/foreground/images/launcher_filetypes/2x/launcher_filetype_ppt.png" type="BINDATA" />
+      <include name="IDR_FILE_MANAGER_IMG_LAUNCHER_FILETYPE_2X_SCRIPT" file="file_manager/foreground/images/launcher_filetypes/2x/launcher_filetype_script.png" type="BINDATA" />
+      <include name="IDR_FILE_MANAGER_IMG_LAUNCHER_FILETYPE_2X_SITES" file="file_manager/foreground/images/launcher_filetypes/2x/launcher_filetype_sites.png" type="BINDATA" />
+      <include name="IDR_FILE_MANAGER_IMG_LAUNCHER_FILETYPE_2X_VIDEO" file="file_manager/foreground/images/launcher_filetypes/2x/launcher_filetype_video.png" type="BINDATA" />
+      <include name="IDR_FILE_MANAGER_IMG_LAUNCHER_FILETYPE_2X_WORD" file="file_manager/foreground/images/launcher_filetypes/2x/launcher_filetype_word.png" type="BINDATA" />
 
       <!-- Resources used for non-flattened HTML files. -->
       <include name="IDR_FILE_MANAGER_DRIVE_WELCOME_STYLE" file="file_manager/foreground/css/drive_welcome.css" type="BINDATA" />