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

chrome/browser/chromeos/extensions/file_handler_util.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/extensions/file_handler_util.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/i18n/case_conversion.h"
 #include "base/json/json_writer.h"
@@ skipping 212 matching lines @@
                  std::string* action_id) {
   std::vector<std::string> result;
   int count = Tokenize(task_id, std::string("|"), &result);
   if (count != 2)
     return false;
   *extension_id = result[0];
   *action_id = result[1];
   return true;
 }
 
+// Find a specific handler in the handler list.
+LastUsedHandlerList::iterator FindHandler(
+    LastUsedHandlerList* list,
+    const std::string & extension_id,

[dgozman, 2012/06/18 15:21:14]

no space before &

[Vladislav Kaznacheev, 2012/06/18 17:05:54]

Done.

+    const std::string & id) {
+  LastUsedHandlerList::iterator iter = list->begin();
+  while (iter != list->end() &&
+      !(iter->handler->extension_id() == extension_id &&

[dgozman, 2012/06/18 15:21:14]

I'd indent this with 3 more spaces.

[Vladislav Kaznacheev, 2012/06/18 17:05:54]

Done.

+        iter->handler->id() == id))
+    iter++;

[dgozman, 2012/06/18 15:21:14]

AFAIK, while body must be a block.

[Vladislav Kaznacheev, 2012/06/18 17:05:54]

Done.

+  return iter;
+}
+
 // Given the list of selected files, returns array of context menu tasks
 // that are shared
 bool FindCommonTasks(Profile* profile,
                      const std::vector<GURL>& files_list,
                      LastUsedHandlerList* named_action_list) {
   named_action_list->clear();
   ActionSet common_tasks;
   for (std::vector<GURL>::const_iterator it = files_list.begin();
        it != files_list.end(); ++it) {
     ActionSet file_actions;
@@ skipping 22 matching lines @@
   }
 
   const DictionaryValue* prefs_tasks =
       profile->GetPrefs()->GetDictionary(prefs::kLastUsedFileBrowserHandlers);
   for (ActionSet::const_iterator iter = common_tasks.begin();
        iter != common_tasks.end(); ++iter) {
     // Get timestamp of when this task was used last time.
     int last_used_timestamp = 0;
 
     if ((*iter)->extension_id() == kFileBrowserDomain) {
-      // Give a little bump to the action from File Browser extenion
+      // Give a little bump to the action from File Browser extension
       // to make sure it is the default on a fresh profile.
       last_used_timestamp = 1;
     }
     prefs_tasks->GetInteger(MakeTaskID((*iter)->extension_id(), (*iter)->id()),
                             &last_used_timestamp);
     URLPatternSet matching_patterns = GetAllMatchingPatterns(*iter, files_list);
     named_action_list->push_back(LastUsedHandler(last_used_timestamp, *iter,
                                                  matching_patterns));
   }
 
+  LastUsedHandlerList::iterator watch_iter = FindHandler(
+      named_action_list, kFileBrowserDomain, kFileBrowserWatchTaskId);
+  LastUsedHandlerList::iterator gallery_iter = FindHandler(
+      named_action_list, kFileBrowserDomain, kFileBrowserGalleryTaskId);
+  if (watch_iter != named_action_list->end() &&
+      gallery_iter != named_action_list->end()) {
+    // Both "watch" and "gallery" actions are applicable which means that
+    // the selection is all videos. Showing them both is confusing. We only keep
+    // the one that makes more sense ("watch" for single selection, "gallery"
+    // for multiple selection).
+
+    if (files_list.size() == 1)
+      named_action_list->erase(gallery_iter);
+    else
+      named_action_list->erase(watch_iter);
+  }
+
   SortLastUsedHandlerList(named_action_list);
   return true;
 }
 
 bool GetDefaultTask(
     Profile* profile, const GURL& url, const FileBrowserHandler** handler) {
   std::vector<GURL> file_urls;
   file_urls.push_back(url);
 
   LastUsedHandlerList common_tasks;
@@ skipping 416 matching lines @@
         handler_host_permissions_[i].first,
         handler_host_permissions_[i].second);
   }
 
   // We don't need this anymore.
   handler_host_permissions_.clear();
 }
 
 } // namespace file_handler_util