Skip to content

GitLab

T
tangled
Commit 64067bf2 authored by yawano's avatar yawano Committed by Commit bot
Browse files
Options

Show file type icons in launcher search results. 

BUG=486236
TEST=manually tested.

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

Cr-Commit-Position: refs/heads/master@{#329573}
parent 5e45b0f3
Hide whitespace changes
Inline Side-by-side
Showing with 31 additions and 2 deletions
ui/file_manager/file_manager/background/js/launcher_search.js
View file @ 64067bf2
...@@ -118,11 +118,18 @@ LauncherSearch.prototype.onQueryStarted_ = function(queryId, query, limit) { ...@@ -118,11 +118,18 @@ LauncherSearch.prototype.onQueryStarted_ = function(queryId, query, limit) {
chrome.launcherSearchProvider.setSearchResults( chrome.launcherSearchProvider.setSearchResults(
queryId, queryId,
results.map(function(result) { results.map(function(result) {
// TODO(yawano): Set custome icon to a result when the API becomes // Use high-dpi icons since preferred icon size is 24px in the
// to support it. // current implementation.
//
// TODO(yawano): Use filetype_folder_shared.png for a shared
// folder.
var iconUrl = chrome.runtime.getURL(
'foreground/images/filetype/2x/filetype_' +
FileType.getIcon(result.entry) + '.png');
return { return {
itemId: result.entry.toURL(), itemId: result.entry.toURL(),
title: result.entry.name, title: result.entry.name,
iconUrl: iconUrl,
// Relevance is set as 2 for all results as a temporary // Relevance is set as 2 for all results as a temporary
// implementation. 2 is the middle value. // implementation. 2 is the middle value.
// TODO(yawano): Implement practical relevance calculation. // TODO(yawano): Implement practical relevance calculation.
......
ui/file_manager/file_manager_resources.grd
View file @ 64067bf2
...@@ -82,6 +82,28 @@ ...@@ -82,6 +82,28 @@
<include name="IDR_FILE_MANAGER_GALLERY_ICON_128" file="gallery/images/icon128.png" type="BINDATA" /> <include name="IDR_FILE_MANAGER_GALLERY_ICON_128" file="gallery/images/icon128.png" type="BINDATA" />
<include name="IDR_FILE_MANAGER_GALLERY_ICON_256" file="gallery/images/icon256.png" type="BINDATA" /> <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" />
<!-- Resources used for non-flattened HTML files. --> <!-- 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" /> <include name="IDR_FILE_MANAGER_DRIVE_WELCOME_STYLE" file="file_manager/foreground/css/drive_welcome.css" type="BINDATA" />
<include name="IDR_FILE_MANAGER_IMG_UI_DRIVE_WELCOME_BACKGROUND" file="../webui/resources/images/clouds.png" type="BINDATA" /> <include name="IDR_FILE_MANAGER_IMG_UI_DRIVE_WELCOME_BACKGROUND" file="../webui/resources/images/clouds.png" type="BINDATA" />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment