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

Unified Diff: chrome/browser/resources/file_manager/js/file_tasks.js

Issue 10804010: HiDPI assets for Chrome OS Files app (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Changed ID ranges to accommodate new resources Created 8 years, 5 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: chrome/browser/resources/file_manager/js/file_tasks.js
diff --git a/chrome/browser/resources/file_manager/js/file_tasks.js b/chrome/browser/resources/file_manager/js/file_tasks.js
index 7ad1a474700cd3f30d4daed92a51a58c41860117..45e78f114e2053b1b4dac5e25bd7173e7e9c6bd7 100644
--- a/chrome/browser/resources/file_manager/js/file_tasks.js
+++ b/chrome/browser/resources/file_manager/js/file_tasks.js
@@ -52,6 +52,12 @@ FileTasks.prototype.processTasks_ = function(tasks) {
this.tasks_ = [];
var id = this.fileManager_.getExtensionId();
+ // TODO(kaznacheev): Teach menu items to use HiDPI assets.
+ function getFileTypeIcon(type) {
+ return chrome.extension.getURL(
+ 'images/files/file_types/' + type + '.png');
+ }
+
for (var i = 0; i < tasks.length; i++) {
var task = tasks[i];
@@ -61,46 +67,34 @@ FileTasks.prototype.processTasks_ = function(tasks) {
if (task_parts[1] == 'play') {
// TODO(serya): This hack needed until task.iconUrl is working
// (see GetFileTasksFileBrowserFunction::RunImpl).
- task.iconUrl =
- chrome.extension.getURL('images/filetype_audio.png');
+ task.iconUrl = getFileTypeIcon('audio');
task.title = loadTimeData.getString('ACTION_LISTEN');
} else if (task_parts[1] == 'mount-archive') {
- task.iconUrl =
- chrome.extension.getURL('images/filetype_archive.png');
+ task.iconUrl = getFileTypeIcon('archive');
task.title = loadTimeData.getString('MOUNT_ARCHIVE');
} else if (task_parts[1] == 'gallery') {
+ task.iconUrl = getFileTypeIcon('image');
task.title = loadTimeData.getString('ACTION_OPEN');
- task.iconUrl =
- chrome.extension.getURL('images/filetype_image.png');
} else if (task_parts[1] == 'watch') {
- task.iconUrl =
- chrome.extension.getURL('images/filetype_video.png');
+ task.iconUrl = getFileTypeIcon('video');
task.title = loadTimeData.getString('ACTION_WATCH');
} else if (task_parts[1] == 'open-hosted') {
- if (this.urls_.length > 1) {
- task.iconUrl =
- chrome.extension.getURL('images/filetype_generic.png');
- } else {
- // Use specific icon.
- var icon = FileType.getIcon(this.urls_[0]);
- task.iconUrl =
- chrome.extension.getURL('images/filetype_' + icon + '.png');
- }
+ if (this.urls_.length > 1)
+ task.iconUrl = getFileTypeIcon('generic');
+ else // Use specific icon.
+ task.iconUrl = getFileTypeIcon(FileType.getIcon(this.urls_[0]));
task.title = loadTimeData.getString('ACTION_OPEN');
} else if (task_parts[1] == 'view-pdf') {
// Do not render this task if disabled.
if (!loadTimeData.getBoolean('PDF_VIEW_ENABLED'))
continue;
- task.iconUrl =
- chrome.extension.getURL('images/filetype_pdf.png');
+ task.iconUrl = getFileTypeIcon('pdf');
task.title = loadTimeData.getString('ACTION_VIEW');
} else if (task_parts[1] == 'view-in-browser') {
- task.iconUrl =
- chrome.extension.getURL('images/filetype_generic.png');
+ task.iconUrl = getFileTypeIcon('generic');
task.title = loadTimeData.getString('ACTION_VIEW');
} else if (task_parts[1] == 'install-crx') {
- task.iconUrl =
- chrome.extension.getURL('images/filetype_generic.png');
+ task.iconUrl = getFileTypeIcon('generic');
task.title = loadTimeData.getString('INSTALL_CRX');
}
}

Powered by Google App Engine
This is Rietveld 408576698