file_manager: IsFallbackFileBrowserHandler() to take TaskDescriptor

chrome/browser/chromeos/extensions/file_manager/file_browser_handlers.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_manager/file_browser_handlers.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/i18n/case_conversion.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 508 matching lines @@
   if (ShouldBeOpenedWithBrowser(extension->id(), action_id)) {
     return OpenFilesWithBrowser(profile, file_urls);
   }
 
   // The executor object will be self deleted on completion.
   (new FileBrowserHandlerExecutor(
       profile, extension, tab_id, action_id))->Execute(file_urls, done);
   return true;
 }
 
-bool IsFallbackFileBrowserHandler(const FileBrowserHandler* handler) {
-  const std::string& extension_id = handler->extension_id();
-  return (extension_id == kFileManagerAppId ||
-          extension_id == extension_misc::kQuickOfficeComponentExtensionId ||
-          extension_id == extension_misc::kQuickOfficeDevExtensionId ||
-          extension_id == extension_misc::kQuickOfficeExtensionId);
+bool IsFallbackFileBrowserHandler(const file_tasks::TaskDescriptor& task) {
+  return (task.task_type == file_tasks::TASK_TYPE_FILE_BROWSER_HANDLER &&
+          (task.app_id == kFileManagerAppId ||
+           task.app_id == extension_misc::kQuickOfficeComponentExtensionId ||
+           task.app_id == extension_misc::kQuickOfficeDevExtensionId ||
+           task.app_id == extension_misc::kQuickOfficeExtensionId));
 }
 
 FileBrowserHandlerList FindDefaultFileBrowserHandlers(
     const PrefService& pref_service,
     const std::vector<base::FilePath>& file_list,
     const FileBrowserHandlerList& common_handlers) {
   FileBrowserHandlerList default_handlers;
 
   std::set<std::string> default_ids;
   for (std::vector<base::FilePath>::const_iterator it = file_list.begin();
        it != file_list.end(); ++it) {
     std::string task_id = file_tasks::GetDefaultTaskIdFromPrefs(
         pref_service, "", it->Extension());
     if (!task_id.empty())
       default_ids.insert(task_id);
   }
 
   const FileBrowserHandler* fallback_handler = NULL;
   // Convert the default task IDs collected above to one of the handler pointers
   // from common_handlers.
   for (size_t i = 0; i < common_handlers.size(); ++i) {
     const FileBrowserHandler* handler = common_handlers[i];
-    std::string task_id = file_tasks::MakeTaskID(
+    const file_tasks::TaskDescriptor task_descriptor(
         handler->extension_id(),
         file_tasks::TASK_TYPE_FILE_BROWSER_HANDLER,
         handler->id());
+    const std::string task_id =
+        file_tasks::TaskDescriptorToId(task_descriptor);
     std::set<std::string>::iterator default_iter = default_ids.find(task_id);
     if (default_iter != default_ids.end()) {
       default_handlers.push_back(handler);
       continue;
     }
 
     // Remember the first fallback handler.
-    if (!fallback_handler && IsFallbackFileBrowserHandler(handler))
+    if (!fallback_handler && IsFallbackFileBrowserHandler(task_descriptor))
       fallback_handler = handler;
   }
 
   // If there are no default handlers found, use fallback as default.
   if (fallback_handler && default_handlers.empty())
     default_handlers.push_back(fallback_handler);
 
   return default_handlers;
 }
 
@@ skipping 77 matching lines @@
   }
 
   // If there are no default handlers, use first handler in the list (file
   // manager does the same in this situation).  TODO(tbarzic): This is not so
   // optimal behaviour.
   return *common_handlers.begin();
 }
 
 }  // namespace file_browser_handlers
 }  // namespace file_manager