Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8024)

Unified Diff: chrome/browser/ui/cocoa/extensions/extension_keybinding_registry_cocoa.mm

Issue 10880064: Make extension commands grant the activeTab permission. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: comments Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/cocoa/extensions/extension_keybinding_registry_cocoa.mm
diff --git a/chrome/browser/ui/cocoa/extensions/extension_keybinding_registry_cocoa.mm b/chrome/browser/ui/cocoa/extensions/extension_keybinding_registry_cocoa.mm
index b69642193ae7947d53f8234431e40e3896ec7b78..ed1cbdde51d70bb2c3b17cc0e90843b6c369e39e 100644
--- a/chrome/browser/ui/cocoa/extensions/extension_keybinding_registry_cocoa.mm
+++ b/chrome/browser/ui/cocoa/extensions/extension_keybinding_registry_cocoa.mm
@@ -6,7 +6,6 @@
#include "chrome/browser/extensions/api/commands/command_service.h"
#include "chrome/browser/extensions/api/commands/command_service_factory.h"
-#include "chrome/browser/extensions/browser_event_router.h"
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/common/extensions/extension.h"
@@ -28,8 +27,9 @@ bool ExtensionKeybindingRegistryCocoa::shortcut_handling_suspended_ = false;
ExtensionKeybindingRegistryCocoa::ExtensionKeybindingRegistryCocoa(
Profile* profile,
gfx::NativeWindow window,
- ExtensionFilter extension_filter)
- : ExtensionKeybindingRegistry(profile, extension_filter),
+ ExtensionFilter extension_filter,
+ Delegate* delegate)
+ : ExtensionKeybindingRegistry(profile, extension_filter, delegate),
profile_(profile),
window_(window) {
Init();
@@ -62,9 +62,7 @@ bool ExtensionKeybindingRegistryCocoa::ProcessKeyEvent(
} else {
// Not handled by using notifications. Route it through the Browser Event
// Router.
- ExtensionService* service = profile_->GetExtensionService();
- service->browser_event_router()->CommandExecuted(
- profile_, extension_id, command_name);
+ CommandExecuted(extension_id, command_name);
return true;
}

Powered by Google App Engine
This is Rietveld 408576698