Make ActiveScriptController use Active Tab-style permissions

chrome/browser/extensions/active_tab_permission_granter.cc

 // Copyright (c) 2012 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/extensions/active_tab_permission_granter.h"
 
 #include "chrome/browser/profiles/profile.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/common/extension_messages.h"
 #include "extensions/common/permissions/permission_set.h"
 #include "extensions/common/permissions/permissions_data.h"
 #include "extensions/common/user_script.h"
+#include "url/gurl.h"
 
 using content::RenderProcessHost;
 using content::WebContentsObserver;
 
 namespace extensions {
 
 ActiveTabPermissionGranter::ActiveTabPermissionGranter(
     content::WebContents* web_contents,
     int tab_id,
     Profile* profile)
     : WebContentsObserver(web_contents),
       tab_id_(tab_id),
       extension_registry_observer_(this) {
   extension_registry_observer_.Add(ExtensionRegistry::Get(profile));
 }
 
 ActiveTabPermissionGranter::~ActiveTabPermissionGranter() {}
 
 void ActiveTabPermissionGranter::GrantIfRequested(const Extension* extension) {
   // Active tab grant request implies there was a user gesture.
   web_contents()->UserGestureDone();
 
   if (granted_extensions_.Contains(extension->id()))
     return;
 
   APIPermissionSet new_apis;
   URLPatternSet new_hosts;
 
-  if (extension->HasAPIPermission(APIPermission::kActiveTab)) {
+  // If the extension requires action for script execution, we grant it
+  // active tab-style permissions, even if it doesn't have the activeTab
+  // permission in the manifest.
+  // We don't take tab id into account, because we want to know if the extension
+  // should require active tab in general (not for the current tab).
+  bool requires_action_for_script_execution =
+      PermissionsData::RequiresActionForScriptExecution(
+          extension,
+          -1,  // No tab id.
+          GURL::EmptyGURL());
+
+  if (extension->HasAPIPermission(APIPermission::kActiveTab) ||
+      requires_action_for_script_execution) {
     URLPattern pattern(UserScript::ValidUserScriptSchemes());
     // Pattern parsing could fail if this is an unsupported URL e.g. chrome://.
     if (pattern.Parse(web_contents()->GetURL().spec()) ==
             URLPattern::PARSE_SUCCESS) {
       new_hosts.AddPattern(pattern);
     }
     new_apis.insert(APIPermission::kTab);
   }
 
   if (extension->HasAPIPermission(APIPermission::kTabCapture))
@@ skipping 51 matching lines @@
        it != granted_extensions_.end(); ++it) {
     PermissionsData::ClearTabSpecificPermissions(it->get(), tab_id_);
     extension_ids.push_back((*it)->id());
   }
 
   Send(new ExtensionMsg_ClearTabSpecificPermissions(tab_id_, extension_ids));
   granted_extensions_.Clear();
 }
 
 }  // namespace extensions