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 13 matching lines @@
 #include "chrome/common/pref_names.h"
 #include "chromeos/chromeos_switches.h"
 #include "components/arc/arc_bridge_service.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 {
 
+constexpr const char kNewNoteAction[] = "new_note";

[Daniel Erat, 2017/01/06 21:01:45]

nit: mind renaming this to kChromeNewNoteAction or something similar and adding
a brief comment describing what it is?

[Daniel Erat, 2017/01/06 21:02:33]

oh, and i'd also recommend making it a public static member, as the android
constants are, so the test can use it as well.

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

Done.

+
 // Pointer to singleton instance.
 NoteTakingHelper* g_helper = nullptr;
 
 // Whitelisted Chrome note-taking apps.
 const char* const kExtensionIds[] = {
     // TODO(jdufault): Remove dev version? See crbug.com/640828.
     NoteTakingHelper::kDevKeepExtensionId,
     NoteTakingHelper::kProdKeepExtensionId,
 };
 
@@ skipping 205 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(
+            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 == kNewNoteAction)
+        extensions.push_back(extension.get());
+    }
+  }
+
   return extensions;
 }
 
 void NoteTakingHelper::UpdateAndroidApps() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   auto* helper = GetIntentHelper("RequestIntentHandlerList", 12);
   if (!helper)
     return;
   helper->RequestIntentHandlerList(
       CreateIntentInfo(GURL()), base::Bind(&NoteTakingHelper::OnGotAndroidApps,
@@ skipping 93 matching lines @@
     for (auto& observer : observers_)
       observer.OnAvailableNoteTakingAppsUpdated();
   }
 }
 
 void NoteTakingHelper::OnShutdown(extensions::ExtensionRegistry* registry) {
   extension_registry_observer_.Remove(registry);
 }
 
 }  // namespace chromeos