Make extension commands grant the activeTab permission.

chrome/browser/extensions/extension_keybinding_registry.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/extension_keybinding_registry.h"
 
+#include "chrome/browser/extensions/active_tab_permission_granter.h"
+#include "chrome/browser/extensions/browser_event_router.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension_manifest_constants.h"
 #include "chrome/common/extensions/extension_set.h"
 
 namespace extensions {
 
 ExtensionKeybindingRegistry::ExtensionKeybindingRegistry(
-    Profile* profile, ExtensionFilter extension_filter)
-    : profile_(profile), extension_filter_(extension_filter) {
+    Profile* profile, ExtensionFilter extension_filter, Delegate* delegate)
+    : profile_(profile),
+      extension_filter_(extension_filter),
+      delegate_(delegate) {
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_LOADED,
                  content::Source<Profile>(profile->GetOriginalProfile()));
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNLOADED,
                  content::Source<Profile>(profile->GetOriginalProfile()));
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_COMMAND_ADDED,
                  content::Source<Profile>(profile->GetOriginalProfile()));
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_COMMAND_REMOVED,
                  content::Source<Profile>(profile->GetOriginalProfile()));
 }
 
@@ skipping 12 matching lines @@
       AddExtensionKeybinding(*iter, std::string());
 }
 
 bool ExtensionKeybindingRegistry::ShouldIgnoreCommand(
     const std::string& command) const {
   return command == extension_manifest_values::kPageActionCommandEvent ||
          command == extension_manifest_values::kBrowserActionCommandEvent ||
          command == extension_manifest_values::kScriptBadgeCommandEvent;
 }
 
+void ExtensionKeybindingRegistry::CommandExecuted(
+    const std::string& extension_id, const std::string& command) {
+  ExtensionService* service =
+      ExtensionSystem::Get(profile_)->extension_service();
+
+  const Extension* extension = service->extensions()->GetByID(extension_id);
+  if (!extension)
+    return;
+
+  // Grant before sending the event so that the permission is granted before
+  // the extension acts on the command.
+  ActiveTabPermissionGranter* granter =
+      delegate_->GetActiveTabPermissionGranter();
+  if (granter)
+    granter->GrantIfRequested(extension);
+
+  service->browser_event_router()->CommandExecuted(profile_,
+                                                   extension_id,
+                                                   command);
+}
+
 void ExtensionKeybindingRegistry::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   switch (type) {
     case chrome::NOTIFICATION_EXTENSION_LOADED: {
       const extensions::Extension* extension =
           content::Details<const extensions::Extension>(details).ptr();
       if (ExtensionMatchesFilter(extension))
         AddExtensionKeybinding(extension, std::string());
@@ skipping 42 matching lines @@
       return true;
     case PLATFORM_APPS_ONLY:
       return extension->is_platform_app();
     default:
       NOTREACHED();
   }
   return false;
 }
 
 }  // namespace extensions