chromeos: Update ARC file task code to use action strings.

chrome/browser/chromeos/file_manager/arc_file_tasks.cc

 // Copyright (c) 2016 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/arc_file_tasks.h"
 
 #include <map>
 #include <memory>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/base64.h"
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_restrictions.h"
 #include "chrome/browser/chromeos/file_manager/path_util.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/common/extensions/api/file_manager_private.h"
 #include "components/arc/arc_bridge_service.h"
 #include "components/arc/arc_service_manager.h"
 #include "components/arc/common/intent_helper.mojom.h"
 #include "components/arc/intent_helper/activity_icon_loader.h"
 #include "components/arc/intent_helper/arc_intent_helper_bridge.h"
+#include "components/arc/intent_helper/intent_constants.h"
 #include "components/user_manager/user_manager.h"
 #include "content/public/browser/browser_thread.h"
 #include "extensions/browser/entry_info.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "net/base/escape.h"
 #include "net/base/filename_util.h"
 #include "storage/browser/fileapi/file_system_url.h"
 #include "url/gurl.h"
 
 namespace file_manager {
@@ skipping 31 matching lines @@
 // Returns the icon loader that wraps the Mojo interface for ARC Intent Helper.
 scoped_refptr<arc::ActivityIconLoader> GetArcActivityIconLoader() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   arc::ArcServiceManager* arc_service_manager = arc::ArcServiceManager::Get();
   if (!arc_service_manager)
     return nullptr;
   return arc_service_manager->icon_loader();
 }
 
-std::string ArcActionTypeToString(arc::mojom::ActionType action_type) {
-  switch (action_type) {
-    case arc::mojom::ActionType::VIEW:
-      return "view";
-    case arc::mojom::ActionType::SEND:
-      return "send";
-    case arc::mojom::ActionType::SEND_MULTIPLE:
-      return "send_multiple";
-  }
-  NOTREACHED();
+// Converts an Android intent action (see kIntentAction* in
+// components/arc/intent_helper/intent_constants.h) to a file task action ID
+// (see chrome/browser/chromeos/file_manager/file_tasks.h).
+std::string ArcActionToFileTaskActionId(const std::string& action) {
+  if (action == arc::kIntentActionView)
+    return "view";
+  else if (action == arc::kIntentActionSend)
+    return "send";
+  else if (action == arc::kIntentActionSendMultiple)
+    return "send_multiple";
+  NOTREACHED() << "Unhandled ARC action \"" << action << "\"";
   return "";
 }
 
-arc::mojom::ActionType StringToArcActionType(const std::string& str) {
-  if (str == "view")
+// TODO(derat): Replace this with a FileTaskActionIdToArcAction method once
+// HandleUrlList has been updated to take a string action rather than an
+// ArcActionType.
+arc::mojom::ActionType FileTaskActionIdToArcActionType(const std::string& id) {
+  if (id == "view")
     return arc::mojom::ActionType::VIEW;
-  if (str == "send")
+  if (id == "send")
     return arc::mojom::ActionType::SEND;
-  if (str == "send_multiple")
+  if (id == "send_multiple")
     return arc::mojom::ActionType::SEND_MULTIPLE;
-  NOTREACHED();
+  NOTREACHED() << "Unhandled file task action ID \"" << id << "\"";
   return arc::mojom::ActionType::VIEW;
 }
 
 std::string ActivityNameToAppId(const std::string& package_name,
                                 const std::string& activity_name) {
   return package_name + kAppIdSeparator + activity_name;
 }
 
 arc::mojom::ActivityNamePtr AppIdToActivityName(const std::string& id) {
   arc::mojom::ActivityNamePtr name = arc::mojom::ActivityName::New();
@@ skipping 137 matching lines @@
     std::unique_ptr<std::vector<FullTaskDescriptor>> result_list,
     const FindTasksCallback& callback,
     mojo::Array<arc::mojom::IntentHandlerInfoPtr> handlers,
     std::unique_ptr<IconUrlMap> icons) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   using extensions::api::file_manager_private::Verb;
   for (const arc::mojom::IntentHandlerInfoPtr& handler : handlers) {
     std::string name(handler->name);
     Verb handler_verb = Verb::VERB_NONE;
-    if (handler->action_type == arc::mojom::ActionType::SEND ||
-        handler->action_type == arc::mojom::ActionType::SEND_MULTIPLE) {
+    if (handler->action == arc::kIntentActionSend ||
+        handler->action == arc::kIntentActionSendMultiple) {
       handler_verb = Verb::VERB_SHARE_WITH;
     }
     const GURL& icon_url = (*icons)[arc::ActivityIconLoader::ActivityName(
         handler->package_name, handler->activity_name)];
     result_list->push_back(FullTaskDescriptor(
         TaskDescriptor(
             ActivityNameToAppId(handler->package_name, handler->activity_name),
-            TASK_TYPE_ARC_APP, ArcActionTypeToString(handler->action_type)),
+            TASK_TYPE_ARC_APP, ArcActionToFileTaskActionId(handler->action)),
         name, handler_verb, icon_url, false /* is_default */,
-        handler->action_type != arc::mojom::ActionType::VIEW /* is_generic */));
+        handler->action != arc::kIntentActionView /* is_generic */));
   }
   callback.Run(std::move(result_list));
 }
 
 }  // namespace
 
 void FindArcTasks(Profile* profile,
                   const std::vector<extensions::EntryInfo>& entries,
                   std::unique_ptr<std::vector<FullTaskDescriptor>> result_list,
                   const FindTasksCallback& callback) {
@@ skipping 52 matching lines @@
       return false;
     }
 
     arc::mojom::UrlWithMimeTypePtr url_with_type =
         arc::mojom::UrlWithMimeType::New();
     url_with_type->url = url.spec();
     url_with_type->mime_type = mime_types[i];
     urls.push_back(std::move(url_with_type));
   }
 
-  arc_intent_helper->HandleUrlList(std::move(urls),
-                                   AppIdToActivityName(task.app_id),
-                                   StringToArcActionType(task.action_id));
+  arc_intent_helper->HandleUrlList(
+      std::move(urls), AppIdToActivityName(task.app_id),
+      FileTaskActionIdToArcActionType(task.action_id));
   return true;
 }
 
 }  // namespace file_tasks
 }  // namespace file_manager