Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(756)

Unified Diff: ui/file_manager/file_manager/background/js/launcher_search.js

Issue 1163973006: Add filetype icon resources for launcher search result. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ui/file_manager/file_manager/background/js/launcher_search.js
diff --git a/ui/file_manager/file_manager/background/js/launcher_search.js b/ui/file_manager/file_manager/background/js/launcher_search.js
index 7806f9b7fd9698e8c5fb9d0a6b25503a24cdcfaf..381831a2696974020064c73350169b34a2b1bae2 100644
--- a/ui/file_manager/file_manager/background/js/launcher_search.js
+++ b/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,

Powered by Google App Engine
This is Rietveld 408576698