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 14 matching lines @@
 #include "chromeos/chromeos_switches.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/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_constants.h"
 #include "url/gurl.h"
 
 namespace app_runtime = extensions::api::app_runtime;
 
 namespace chromeos {
 namespace {
 
 // Pointer to singleton instance.
 NoteTakingHelper* g_helper = nullptr;
 
@@ skipping 18 matching lines @@
 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;
 }
 
 }  // namespace
 
+const char NoteTakingHelper::kChromeNewNoteAction[] = "new_note";
 const char NoteTakingHelper::kIntentAction[] =
     "org.chromium.arc.intent.action.CREATE_NOTE";
 const char NoteTakingHelper::kDevKeepExtensionId[] =
     "ogfjaccbdfhecploibfbhighmebiffla";
 const char NoteTakingHelper::kProdKeepExtensionId[] =
     "hmjkmjkepdijhoojdojkdfohbdgmmhki";
 
 // static
 void NoteTakingHelper::Initialize() {
   DCHECK(!g_helper);
@@ skipping 164 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) {
+    // Find "action_handler" manifest entry.
+    const base::ListValue* action_handlers;
+    if (!extension->manifest()->GetList(

[Devlin, 2017/01/09 23:39:02]

This shouldn't be handled here.  Instead, we should have an
action_handler-related manifest handler that parses the data in the manifest and
checks it for correctness.  Then, things like this should call into that to get
the appropriate data from the ManifestData.  See examples in
extensions/common/manifest_handlers.

[jdufault, 2017/01/12 22:22:24]

Done.

+            extensions::manifest_keys::kActionHandlers, &action_handlers)) {
+      continue;
+    }
+
+    // Check for "new_note" action.
+    for (const auto& wrapped_action_handler : *action_handlers) {
+      std::string action_handler;
+      if (!wrapped_action_handler->GetAsString(&action_handler))
+        continue;
+
+      if (action_handler == kChromeNewNoteAction)
+        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 97 matching lines @@
     for (auto& observer : observers_)
       observer.OnAvailableNoteTakingAppsUpdated();
   }
 }
 
 void NoteTakingHelper::OnShutdown(extensions::ExtensionRegistry* registry) {
   extension_registry_observer_.Remove(registry);
 }
 
 }  // namespace chromeos