Chrome app manifest support for action handlers.

chrome/browser/chromeos/note_taking_helper.cc

 // 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.
 
 #include "chrome/browser/chromeos/note_taking_helper.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "apps/launcher.h"
@@ skipping 15 matching lines @@
 #include "chromeos/chromeos_switches.h"
 #include "components/arc/arc_bridge_service.h"
 #include "components/arc/arc_service_manager.h"
 #include "components/arc/intent_helper/arc_intent_helper_bridge.h"
 #include "components/prefs/pref_service.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/common/api/app_runtime.h"
 #include "extensions/common/extension.h"
+#include "extensions/common/manifest_handlers/action_handlers_handler.h"
 #include "url/gurl.h"
 
 namespace app_runtime = extensions::api::app_runtime;
 
 namespace chromeos {
 namespace {
 
 // Pointer to singleton instance.
 NoteTakingHelper* g_helper = nullptr;
 
@@ skipping 16 matching lines @@
 // Creates a new Mojo IntentInfo struct for launching an Android note-taking app
 // with an optional ClipData URI.
 arc::mojom::IntentInfoPtr CreateIntentInfo(const GURL& clip_data_uri) {
   arc::mojom::IntentInfoPtr intent = arc::mojom::IntentInfo::New();
   intent->action = NoteTakingHelper::kIntentAction;
   if (!clip_data_uri.is_empty())
     intent->clip_data_uri = clip_data_uri.spec();
   return intent;
 }
 
+// Returns true if the given extension has a new note action handler.
+bool HasNewNoteActionHandler(const extensions::Extension* extension) {
+  std::set<app_runtime::ActionType> action_handlers =
+      extensions::ActionHandlersInfo::GetActionHandlers(extension);
+  return action_handlers.count(app_runtime::ACTION_TYPE_NEW_NOTE) > 0;
+}
+
 }  // namespace
 
 const char NoteTakingHelper::kIntentAction[] =
     "org.chromium.arc.intent.action.CREATE_NOTE";
 const char NoteTakingHelper::kDevKeepExtensionId[] =
     "ogfjaccbdfhecploibfbhighmebiffla";
 const char NoteTakingHelper::kProdKeepExtensionId[] =
     "hmjkmjkepdijhoojdojkdfohbdgmmhki";
 const char NoteTakingHelper::kPreferredLaunchResultHistogramName[] =
     "Apps.NoteTakingApp.PreferredLaunchResult";
@@ skipping 185 matching lines @@
 }
 
 std::vector<const extensions::Extension*> NoteTakingHelper::GetChromeApps(
     Profile* profile) const {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   const extensions::ExtensionRegistry* extension_registry =
       extensions::ExtensionRegistry::Get(profile);
   const extensions::ExtensionSet& enabled_extensions =
       extension_registry->enabled_extensions();
 
-  // TODO(derat): Query for additional Chrome apps once http://crbug.com/657139
-  // is resolved.
   std::vector<const extensions::Extension*> extensions;
   for (const auto& id : whitelisted_chrome_app_ids_) {
     if (enabled_extensions.Contains(id)) {
       extensions.push_back(extension_registry->GetExtensionById(
           id, extensions::ExtensionRegistry::ENABLED));
     }
   }
+
+  // Add any extensions which have a "note" action in their manifest
+  // "action_handler" entry.
+  for (const auto& extension : enabled_extensions) {
+    if (HasNewNoteActionHandler(extension.get()))

[Daniel Erat, 2017/01/12 23:55:03]

we should probably skip whitelisted apps here to make sure they don't appear
twice, right?

[jdufault, 2017/01/14 00:30:42]

Done, nice catch.

+      extensions.push_back(extension.get());
+  }
+
   return extensions;
 }
 
 void NoteTakingHelper::UpdateAndroidApps() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   auto* helper = ARC_GET_INSTANCE_FOR_METHOD(
       arc::ArcServiceManager::Get()->arc_bridge_service()->intent_helper(),
       RequestIntentHandlerList);
   if (!helper)
     return;
@@ skipping 80 matching lines @@
   DCHECK_EQ(type, chrome::NOTIFICATION_PROFILE_ADDED);
   auto registry = extensions::ExtensionRegistry::Get(
       content::Source<Profile>(source).ptr());
   DCHECK(!extension_registry_observer_.IsObserving(registry));
   extension_registry_observer_.Add(registry);
 }
 
 void NoteTakingHelper::OnExtensionLoaded(
     content::BrowserContext* browser_context,
     const extensions::Extension* extension) {
-  if (IsWhitelistedChromeApp(extension)) {
+  if (IsWhitelistedChromeApp(extension) || HasNewNoteActionHandler(extension)) {
     for (auto& observer : observers_)
       observer.OnAvailableNoteTakingAppsUpdated();
   }
 }
 
 void NoteTakingHelper::OnExtensionUnloaded(
     content::BrowserContext* browser_context,
     const extensions::Extension* extension,
     extensions::UnloadedExtensionInfo::Reason reason) {
-  if (IsWhitelistedChromeApp(extension)) {
+  if (IsWhitelistedChromeApp(extension) || HasNewNoteActionHandler(extension)) {
     for (auto& observer : observers_)
       observer.OnAvailableNoteTakingAppsUpdated();
   }
 }
 
 void NoteTakingHelper::OnShutdown(extensions::ExtensionRegistry* registry) {
   extension_registry_observer_.Remove(registry);
 }
 
 }  // namespace chromeos