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

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

Issue 10782028: Merge 142938 - [File Manager] Avoiding confusion between "Watch" and "Open" actions for video files (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1180/src/
Patch Set: 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
« no previous file with comments | « chrome/browser/chromeos/extensions/file_manager_util.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/file_manager/js/file_manager.js
===================================================================
--- chrome/browser/resources/file_manager/js/file_manager.js (revision 146983)
+++ chrome/browser/resources/file_manager/js/file_manager.js (working copy)
@@ -2530,16 +2530,10 @@
chrome.extension.getURL('images/filetype_archive.png');
task.title = str('MOUNT_ARCHIVE');
} else if (task_parts[1] == 'gallery') {
- // If a single video is selected the Gallery is redundant.
- if (selection.urls.length == 1 && FileType.isVideo(selection.urls[0]))
- continue;
task.title = str('ACTION_OPEN');
task.iconUrl =
chrome.extension.getURL('images/filetype_image.png');
} else if (task_parts[1] == 'watch') {
- // Hide "Watch" action for multiple selection.
- if (selection.urls.length > 1)
- continue;
task.iconUrl =
chrome.extension.getURL('images/filetype_video.png');
task.title = str('ACTION_WATCH');
« no previous file with comments | « chrome/browser/chromeos/extensions/file_manager_util.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698