arc: Add action to IntentHandlerInfo and rename enum fields.

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>
@@ skipping 57 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 ArcActionToString(arc::mojom::ActionType action) {
-  switch (action) {
+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();
   return "";
 }
 
-arc::mojom::ActionType StringToArcAction(const std::string& str) {
+arc::mojom::ActionType StringToArcActionType(const std::string& str) {
   if (str == "view")
     return arc::mojom::ActionType::VIEW;
   if (str == "send")
     return arc::mojom::ActionType::SEND;
   if (str == "send_multiple")
     return arc::mojom::ActionType::SEND_MULTIPLE;
   NOTREACHED();
   return arc::mojom::ActionType::VIEW;
 }
 
@@ skipping 144 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 == arc::mojom::ActionType::SEND ||
-        handler->action == arc::mojom::ActionType::SEND_MULTIPLE) {
+    if (handler->action_type == arc::mojom::ActionType::SEND ||
+        handler->action_type == arc::mojom::ActionType::SEND_MULTIPLE) {
       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, ArcActionToString(handler->action)),
+            TASK_TYPE_ARC_APP, ArcActionTypeToString(handler->action_type)),
         name, handler_verb, icon_url, false /* is_default */,
-        handler->action != arc::mojom::ActionType::VIEW /* is_generic */));
+        handler->action_type != arc::mojom::ActionType::VIEW /* 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 56 matching lines @@
         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));
   }
 
   if (GetArcIntentHelper(profile, "HandleUrlList",
                          kArcIntentHelperVersionWithFullActivityName)) {
     arc_intent_helper->HandleUrlList(std::move(urls),
                                      AppIdToActivityName(task.app_id),
-                                     StringToArcAction(task.action_id));
+                                     StringToArcActionType(task.action_id));
   } else {
     arc_intent_helper->HandleUrlListDeprecated(
         std::move(urls), AppIdToActivityName(task.app_id)->package_name,
-        StringToArcAction(task.action_id));
+        StringToArcActionType(task.action_id));
   }
   return true;
 }
 
 }  // namespace file_tasks
 }  // namespace file_manager