Files.app: Stop video support in the gallery.

chrome/browser/chromeos/file_manager/file_tasks.cc

 // 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.
 
 #include "chrome/browser/chromeos/file_manager/file_tasks.h"
 
 #include "apps/launcher.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/prefs/pref_service.h"
@@ skipping 90 matching lines @@
 // Leaves tasks handled by the file manger itself as is and removes all others.
 void KeepOnlyFileManagerInternalTasks(std::vector<FullTaskDescriptor>* tasks) {
   std::vector<FullTaskDescriptor> filtered;
   for (size_t i = 0; i < tasks->size(); ++i) {
     if ((*tasks)[i].task_descriptor().app_id == kFileManagerAppId)
       filtered.push_back((*tasks)[i]);
   }
   tasks->swap(filtered);
 }
 
-// Finds a task that matches |app_id| and |action_id| from |task_list|.
-// Returns a mutable iterator to the handler if found. Returns task_list->end()
-// if not found.
-std::vector<FullTaskDescriptor>::iterator
-FindTaskForAppIdAndActionId(
-    std::vector<FullTaskDescriptor>* task_list,
-    const std::string& app_id,
-    const std::string& action_id) {
-  DCHECK(task_list);
-
-  std::vector<FullTaskDescriptor>::iterator iter = task_list->begin();
-  while (iter != task_list->end() &&
-         !(iter->task_descriptor().app_id == app_id &&
-           iter->task_descriptor().action_id == action_id)) {
-    ++iter;
-  }
-  return iter;
-}
-
 void ChooseSuitableGalleryHandler(std::vector<FullTaskDescriptor>* task_list) {
   const bool disable_new_gallery =
       base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
           chromeos::switches::kFileManagerEnableNewGallery) == "false";
   std::vector<FullTaskDescriptor>::iterator it = task_list->begin();
   while (it != task_list->end()) {
     if (disable_new_gallery) {
       if (it->task_descriptor().app_id == kGalleryAppId)
         it = task_list->erase(it);
       else
         ++it;
     } else {
       if (it->task_descriptor().app_id == kFileManagerAppId &&
-          (it->task_descriptor().action_id == "gallery" ||
-           it->task_descriptor().action_id == "gallery-video")) {
+          it->task_descriptor().action_id == "gallery") {
         it = task_list->erase(it);
       } else {
         ++it;
       }
     }
   }
 }
 
-// Chooses a suitable video handeler and removes other internal video hander.
-// Both "watch" and "gallery-video" actions are applicable which means that the
-// selection is all videos. Showing them both is confusing, so we only keep
-// the one that makes more sense ("watch" for single selection, "gallery"
-// for multiple selection).
-void ChooseSuitableVideoHandler(
-    const std::vector<GURL>& file_urls,
-    std::vector<FullTaskDescriptor>* task_list) {
-  std::vector<FullTaskDescriptor>::iterator video_player_iter =
-      FindTaskForAppIdAndActionId(task_list, kVideoPlayerAppId, "video");
-  std::vector<FullTaskDescriptor>::iterator gallery_video_iter;
-  if (base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
-          chromeos::switches::kFileManagerEnableNewGallery) == "false") {
-    gallery_video_iter = FindTaskForAppIdAndActionId(
-        task_list, kFileManagerAppId, "gallery-video");
-  } else {
-    gallery_video_iter =
-        FindTaskForAppIdAndActionId(task_list, kGalleryAppId, "open");
-  }
-
-  if (video_player_iter != task_list->end() &&
-      gallery_video_iter != task_list->end()) {
-    if (file_urls.size() == 1)
-      task_list->erase(gallery_video_iter);
-    else
-      task_list->erase(video_player_iter);
-  }
-}
-
 }  // namespace
 
 FullTaskDescriptor::FullTaskDescriptor(
     const TaskDescriptor& task_descriptor,
     const std::string& task_title,
     const GURL& icon_url,
     bool is_default)
     : task_descriptor_(task_descriptor),
       task_title_(task_title),
       icon_url_(icon_url),
@@ skipping 341 matching lines @@
   // Find and append file browser handler tasks. We know there aren't
   // duplicates because "file_browser_handlers" and "file_handlers" shouldn't
   // be used in the same manifest.json.
   FindFileBrowserHandlerTasks(profile, file_urls, result_list);
 
   // Google documents can only be handled by internal handlers.
   if (ContainsGoogleDocument(path_mime_set))
     KeepOnlyFileManagerInternalTasks(result_list);
 
   ChooseSuitableGalleryHandler(result_list);
-  ChooseSuitableVideoHandler(file_urls, result_list);
-
   ChooseAndSetDefaultTask(*profile->GetPrefs(), path_mime_set, result_list);
 }
 
 void ChooseAndSetDefaultTask(const PrefService& pref_service,
                              const PathAndMimeTypeSet& path_mime_set,
                              std::vector<FullTaskDescriptor>* tasks) {
   // Collect the task IDs of default tasks from the preferences into a set.
   std::set<std::string> default_task_ids;
   for (PathAndMimeTypeSet::const_iterator it = path_mime_set.begin();
        it != path_mime_set.end(); ++it) {
@@ skipping 24 matching lines @@
     if (file_browser_handlers::IsFallbackFileBrowserHandler(
             task->task_descriptor())) {
       task->set_is_default(true);
       return;
     }
   }
 }
 
 }  // namespace file_tasks
 }  // namespace file_manager