Chrome OS "open with" picker allowing Web Intents

chrome/browser/extensions/extension_special_storage_policy.cc

Index: chrome/browser/extensions/extension_special_storage_policy.cc
diff --git a/chrome/browser/extensions/extension_special_storage_policy.cc b/chrome/browser/extensions/extension_special_storage_policy.cc
index 3d78c1628910d6407f04571b721a136bc921b2c2..c3d69c5582b39693ee033f58b895d7ba28c68900 100644
--- a/chrome/browser/extensions/extension_special_storage_policy.cc
+++ b/chrome/browser/extensions/extension_special_storage_policy.cc
@@ -13,6 +13,7 @@
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/browser_thread.h"
+#include "webkit/glue/web_intent_service_data.h"
 
 using content::BrowserThread;
 using extensions::APIPermission;
@@ -63,7 +64,8 @@ bool ExtensionSpecialStoragePolicy::HasSessionOnlyOrigins() {
 bool ExtensionSpecialStoragePolicy::IsFileHandler(
     const std::string& extension_id) {
   base::AutoLock locker(lock_);
-  return file_handler_extensions_.ContainsExtension(extension_id);
+  return web_intent_extensions_.ContainsExtension(extension_id) ||
+      file_handler_extensions_.ContainsExtension(extension_id);
 }
 
 bool ExtensionSpecialStoragePolicy::NeedsProtection(
@@ -84,7 +86,8 @@ void ExtensionSpecialStoragePolicy::GrantRightsForExtension(
       !extension->HasAPIPermission(
           APIPermission::kUnlimitedStorage) &&
       !extension->HasAPIPermission(
-          APIPermission::kFileBrowserHandler)) {
+          APIPermission::kFileBrowserHandler) &&
+      extension->intents_services().empty()) {
     return;
   }
   {
@@ -97,9 +100,10 @@ void ExtensionSpecialStoragePolicy::GrantRightsForExtension(
     if (extension->HasAPIPermission(APIPermission::kUnlimitedStorage))
       unlimited_extensions_.Add(extension);
     if (extension->HasAPIPermission(
-            APIPermission::kFileBrowserHandler)) {
+            APIPermission::kFileBrowserHandler))
       file_handler_extensions_.Add(extension);
-    }
+    if (!extension->intents_services().empty())
+      web_intent_extensions_.Add(extension);
   }
   NotifyChanged();
 }
@@ -111,7 +115,8 @@ void ExtensionSpecialStoragePolicy::RevokeRightsForExtension(
       !extension->HasAPIPermission(
           APIPermission::kUnlimitedStorage) &&
       !extension->HasAPIPermission(
-          APIPermission::kFileBrowserHandler)) {
+          APIPermission::kFileBrowserHandler) &&
+      extension->intents_services().empty()) {
     return;
   }
   {
@@ -124,6 +129,8 @@ void ExtensionSpecialStoragePolicy::RevokeRightsForExtension(
       unlimited_extensions_.Remove(extension);
     if (extension->HasAPIPermission(APIPermission::kFileBrowserHandler))
       file_handler_extensions_.Remove(extension);
+    if (!extension->intents_services().empty())
+      web_intent_extensions_.Add(extension);
   }
   NotifyChanged();
 }
@@ -135,6 +142,7 @@ void ExtensionSpecialStoragePolicy::RevokeRightsForAllExtensions() {
     installed_apps_.Clear();
     unlimited_extensions_.Clear();
     file_handler_extensions_.Clear();
+    web_intent_extensions_.Clear();
   }
   NotifyChanged();
 }