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

Unified Diff: chrome/browser/ui/views/extensions/extension_keybinding_registry_views.cc

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/views/extensions/extension_keybinding_registry_views.cc
diff --git a/chrome/browser/ui/views/extensions/extension_keybinding_registry_views.cc b/chrome/browser/ui/views/extensions/extension_keybinding_registry_views.cc
index f72c0e9d11685f6a20a50b45859bc4bc55390daf..a163cc39335a855194f596ef2b3aaf97aa28609f 100644
--- a/chrome/browser/ui/views/extensions/extension_keybinding_registry_views.cc
+++ b/chrome/browser/ui/views/extensions/extension_keybinding_registry_views.cc
@@ -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_keybinding_registry.h"
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/profiles/profile.h"
@@ -22,8 +21,9 @@ void extensions::ExtensionKeybindingRegistry::SetShortcutHandlingSuspended(
ExtensionKeybindingRegistryViews::ExtensionKeybindingRegistryViews(
Profile* profile,
views::FocusManager* focus_manager,
- ExtensionFilter extension_filter)
- : ExtensionKeybindingRegistry(profile, extension_filter),
+ ExtensionFilter extension_filter,
+ Delegate* delegate)
+ : ExtensionKeybindingRegistry(profile, extension_filter, delegate),
profile_(profile),
focus_manager_(focus_manager) {
Init();
@@ -87,16 +87,13 @@ void ExtensionKeybindingRegistryViews::RemoveExtensionKeybinding(
bool ExtensionKeybindingRegistryViews::AcceleratorPressed(
const ui::Accelerator& accelerator) {
- ExtensionService* service = profile_->GetExtensionService();
-
EventTargets::iterator it = event_targets_.find(accelerator);
if (it == event_targets_.end()) {
NOTREACHED(); // Shouldn't get this event for something not registered.
return false;
}
- service->browser_event_router()->CommandExecuted(
- profile_, it->second.first, it->second.second);
+ CommandExecuted(it->second.first, it->second.second);
return true;
}

Powered by Google App Engine
This is Rietveld 408576698