arc: Add action to IntentHandlerInfo and rename enum fields.

components/arc/common/intent_helper.mojom

 // Copyright 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.
 //
-// Next MinVersion: 11
+// Next MinVersion: 12
 
 module arc.mojom;
 
 import "scale_factor.mojom";
 
 // Describes the type of action to invoke.
 enum ActionType {
   VIEW,
   SEND,
   SEND_MULTIPLE,
@@ skipping 23 matching lines @@
   [MinVersion=10] array<AuthorityEntry>? data_authorities;
   [MinVersion=10] array<PatternMatcher>? data_paths;
   [MinVersion=10] array<PatternMatcher>? deprecated_data_scheme_specific_parts;
 };
 
 // Describes a package that can handle an intent.
 struct IntentHandlerInfo {
   string name;
   string package_name;
   string activity_name;  // A hint for retrieving the package's icon.
-  [MinVersion=4] ActionType action;
+  [MinVersion=4] ActionType action_type;
   [MinVersion=6] bool is_preferred;
+  [MinVersion=11] string? action;  // e.g. "android.intent.action.VIEW"

[dcheng, 2016/10/04 22:29:11]

How will this field be used?

[Daniel Erat, 2016/10/04 22:43:22]

i can document it in a comment if that'd be better, but i plan to remove
action_type and only use this field in order to support arbitrary intents
(http://crbug.com/647802). alternately, should i name the old field
"deprecated_action_type" instead?

[dcheng, 2016/10/04 22:49:41]

Usually, it's preferred to land this sort of change with something that's
actually using it (especially because for ipc reviews, it's preferred to use
something that's more strongly typed--like the current enum--over something less
loosely typed--like the newly added string field).

I assume that the ARC++ side is blocked on this CL landing though, so please
just CC an IPC reviewer on the followup CL that uses this in Chrome.

[Daniel Erat, 2016/10/04 22:57:35]

got it. yeah, chrome can't use this until the android side sets it, and i
believe that mojom changes are supposed to land in chrome first. i could update
this change so chrome also uses the string if it's present and falls back to the
enum otherwise, but i figured that switching chrome to only use the string in a
later change might make reviews easier.

 };
 
 // Describes an activity.
 struct ActivityName {
   string package_name;
   string activity_name;
 };
 
 // Describes an icon for the activity.
 struct ActivityIcon {
@@ skipping 44 matching lines @@
   // When multiple packages are set as preferred, the most recent setting wins.
   [MinVersion=7] AddPreferredPackage@8(string package_name);
 
   // Handles the URL by sending an ACTION_VIEW intent to the package. The
   // most suitable activity for the URL within the package will be started.
   [MinVersion=2] HandleUrl@2(string url, string package_name);
 
   // Handles the list of URLs by sending a specified intent to the handler.
   [MinVersion=5] HandleUrlList@7(array<UrlWithMimeType> urls,
                                  ActivityName activity,
-                                 ActionType action);
+                                 ActionType action_type);
 
   // Deprecated. Use HandleUrlList.
   [MinVersion=4] HandleUrlListDeprecated@5(array<UrlWithMimeType> urls,
                                            string package_name,
-                                           ActionType action);
+                                           ActionType action_type);
 
   // Establishes full-duplex communication with the host.
   Init@0(IntentHelperHost host_ptr);
 
   // Requests 48dp * 48dp icons of the |activities| suitable for the
   // |scale_factor|. An array of icon data will be returned.
   [MinVersion=3] RequestActivityIcons@4(array<ActivityName> activities,
                                         ScaleFactor scale_factor)
       => (array<ActivityIcon> icons);
 
   // Requests a list of packages that can handle the URL.
   [MinVersion=2] RequestUrlHandlerList@3(string url)
       => (array<IntentHandlerInfo> handlers);
 
   // Requests a list of packages that can handle the list of files.
   [MinVersion=4] RequestUrlListHandlerList@6(array<UrlWithMimeType> urls)
       => (array<IntentHandlerInfo> handlers);
 
   // Send an Android broadcast message to the Android package and class
   // specified.  Data can be sent as extras by including a JSON map string which
   // will be automatically converted to a bundle accessible by the receiver.
   //
   // Note: Broadcasts can only be sent to whitelisted packages.  Packages can be
   // added to the whitelist in ArcBridgeService.java in the Android source.
   [MinVersion=1] SendBroadcast@1(string action,
                                  string package_name,
                                  string cls,
                                  string extras);
 };