Implement app launch changes for app runtime extension proposal.

extensions/browser/api/app_runtime/app_runtime_api.cc

 // Copyright 2014 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 "extensions/browser/api/app_runtime/app_runtime_api.h"
 
 #include <stddef.h>
 
 #include <utility>
 
+#include "base/memory/ptr_util.h"
 #include "base/metrics/histogram.h"
 #include "base/time/time.h"
 #include "base/values.h"
 #include "extensions/browser/entry_info.h"
 #include "extensions/browser/event_router.h"
 #include "extensions/browser/extension_prefs.h"
 #include "extensions/browser/extensions_browser_client.h"
 #include "extensions/browser/granted_file_entry.h"
 #include "extensions/common/api/app_runtime.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/feature_switch.h"
 #include "url/gurl.h"
 
 using content::BrowserContext;
 
 namespace extensions {
 
 namespace app_runtime = api::app_runtime;
 
 namespace {
 
+// Converts an ActionType instance to an app_runtime::ActionType instance.
+app_runtime::ActionType MapActionType(ActionType action_type) {
+  switch (action_type) {
+    case ActionType::NEW_NOTE:
+      return app_runtime::ActionType::ACTION_TYPE_NEW_NOTE;
+  }
+
+  NOTREACHED();

[Daniel Erat, 2016/08/11 20:37:06]

nit: also log the bad type, e.g.

  NOTREACHED() << "Unhandled ActionType " << action_type;

[jdufault, 2016/08/12 18:56:55]

Done, but I had to add a cast since action_type is an enum class.

+  return app_runtime::ActionType::ACTION_TYPE_NONE;

[Daniel Erat, 2016/08/11 20:37:06]

random question: does this _NONE enum value get automatically created?

[Devlin, 2016/08/11 20:51:21]

Yep.

+}
+
+// Converts an ActionData instance to an app_runtime::ActionData instance.
+std::unique_ptr<app_runtime::ActionData> BuildActionData(
+    ActionData action_data) {
+  auto data = base::WrapUnique(new app_runtime::ActionData());
+  data->action_type = MapActionType(action_data.action_type);
+  return data;
+}
+
 void DispatchOnEmbedRequestedEventImpl(
     const std::string& extension_id,
     std::unique_ptr<base::DictionaryValue> app_embedding_request_data,
     content::BrowserContext* context) {
   std::unique_ptr<base::ListValue> args(new base::ListValue());
   args->Append(std::move(app_embedding_request_data));
   std::unique_ptr<Event> event(
       new Event(events::APP_RUNTIME_ON_EMBED_REQUESTED,
                 app_runtime::OnEmbedRequested::kEventName, std::move(args)));
   event->restrict_to_browser_context = context;
@@ skipping 88 matching lines @@
     std::unique_ptr<base::DictionaryValue> embed_app_data,
     const Extension* extension) {
   DispatchOnEmbedRequestedEventImpl(extension->id(), std::move(embed_app_data),
                                     context);
 }
 
 // static
 void AppRuntimeEventRouter::DispatchOnLaunchedEvent(
     BrowserContext* context,
     const Extension* extension,
-    extensions::AppLaunchSource source) {
+    extensions::AppLaunchSource source,
+    base::Optional<ActionData> action_data) {
   app_runtime::LaunchData launch_data;
 
   app_runtime::LaunchSource source_enum = getLaunchSourceEnum(source);
   if (extensions::FeatureSwitch::trace_app_source()->IsEnabled()) {
     launch_data.source = source_enum;
   }
+
+  if (action_data)
+    launch_data.action_data = BuildActionData(action_data.value());
+
   DispatchOnLaunchedEventImpl(extension->id(), source_enum,
                               launch_data.ToValue(), context);
 }
 
 // static
 void AppRuntimeEventRouter::DispatchOnRestartedEvent(
     BrowserContext* context,
     const Extension* extension) {
   std::unique_ptr<base::ListValue> arguments(new base::ListValue());
   std::unique_ptr<Event> event(new Event(events::APP_RUNTIME_ON_RESTARTED,
                                          app_runtime::OnRestarted::kEventName,
                                          std::move(arguments)));
   event->restrict_to_browser_context = context;
   EventRouter::Get(context)
       ->DispatchEventToExtension(extension->id(), std::move(event));
 }
 
 // static
 void AppRuntimeEventRouter::DispatchOnLaunchedEventWithFileEntries(
     BrowserContext* context,
     const Extension* extension,
+    extensions::AppLaunchSource source,
     const std::string& handler_id,
     const std::vector<EntryInfo>& entries,
-    const std::vector<GrantedFileEntry>& file_entries) {
+    const std::vector<GrantedFileEntry>& file_entries,
+    base::Optional<ActionData> action_data) {
+  app_runtime::LaunchSource source_enum = getLaunchSourceEnum(source);

[Devlin, 2016/08/11 20:51:21]

getLaunchSourceEnum -> GetLaunchSourceEnum

I know it's not from this CL, but now's a good time to fix it. :)

[jdufault, 2016/08/12 18:56:55]

Done.

+
   // TODO(sergeygs): Use the same way of creating an event (using the generated
   // boilerplate) as below in DispatchOnLaunchedEventWithUrl.
   std::unique_ptr<base::DictionaryValue> launch_data(new base::DictionaryValue);
   launch_data->SetString("id", handler_id);
 
-  app_runtime::LaunchSource source_enum =
-      app_runtime::LAUNCH_SOURCE_FILE_HANDLER;
   if (extensions::FeatureSwitch::trace_app_source()->IsEnabled()) {

[Daniel Erat, 2016/08/11 20:37:06]

nit: move this up just below the line that initializes source_enum?

[jdufault, 2016/08/12 18:56:55]

source_enum is used below as well (DispatchOnLaunchedEventImpl).

     launch_data->SetString("source", app_runtime::ToString(source_enum));
   }
 
+  if (action_data) {
+    launch_data->Set("action_data",

[Devlin, 2016/08/11 20:51:21]

this should be actionData.

If we used app_runtime::LaunchData instead and then used ToValue(), this would
be a lot more stable.

[jdufault, 2016/08/12 18:56:55]

Done.
Yes, I agree. I converted it but the LaunchItem enum does not contain the
necessary typings. We could go with a hybrid approach, where everything except
the launch items are typed. Alternatively, we could add the typings to launch
item.

[Devlin, 2016/08/16 00:20:09]

We should document the fields of the launch item, which would address this. 
Let's add a TODO for that for now.

[jdufault, 2016/08/16 21:30:57]

Done.

+                     BuildActionData(action_data.value())->ToValue());
+  }
+
   std::unique_ptr<base::ListValue> items(new base::ListValue);
   DCHECK(file_entries.size() == entries.size());
   for (size_t i = 0; i < file_entries.size(); ++i) {
     std::unique_ptr<base::DictionaryValue> launch_item(
         new base::DictionaryValue);
 
     launch_item->SetString("fileSystemId", file_entries[i].filesystem_id);
     launch_item->SetString("baseName", file_entries[i].registered_name);
     launch_item->SetString("mimeType", entries[i].mime_type);
     launch_item->SetString("entryId", file_entries[i].id);
@@ skipping 19 matching lines @@
   launch_data.url.reset(new std::string(url.spec()));
   launch_data.referrer_url.reset(new std::string(referrer_url.spec()));
   if (extensions::FeatureSwitch::trace_app_source()->IsEnabled()) {
     launch_data.source = source_enum;
   }
   DispatchOnLaunchedEventImpl(extension->id(), source_enum,
                               launch_data.ToValue(), context);
 }
 
 }  // namespace extensions