Merge 142938 - [File Manager] Avoiding confusion between "Watch" and "Open" actions for video files

chrome/browser/resources/file_manager/js/file_manager.js

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 /**
  * FileManager constructor.
  *
  * FileManager objects encapsulate the functionality of the file selector
  * dialogs, as well as the full screen file manager application (though the
  * latter is not yet implemented).
@@ skipping 2512 matching lines @@
           // TODO(serya): This hack needed until task.iconUrl is working
           //             (see GetFileTasksFileBrowserFunction::RunImpl).
           task.iconUrl =
               chrome.extension.getURL('images/filetype_audio.png');
           task.title = str('ACTION_LISTEN');
         } else if (task_parts[1] == 'mount-archive') {
           task.iconUrl =
               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');
         } else if (task_parts[1] == 'open-hosted') {
           if (selection.urls.length > 1) {
             task.iconUrl =
                 chrome.extension.getURL('images/filetype_generic.png');
           } else {
             // Use specific icon.
             var icon = FileType.getIcon(selection.urls[0]);
@@ skipping 2033 matching lines @@
     function closeBanner() {
       self.cleanupGDataWelcome_();
       // Stop showing the welcome banner.
       localStorage[WELCOME_HEADER_COUNTER_KEY] = WELCOME_HEADER_COUNTER_LIMIT;
     }
 
     return maybeShowBanner;
   };
 })();