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

Unified Diff: chrome/browser/ui/gtk/extensions/extension_keybinding_registry_gtk.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/gtk/extensions/extension_keybinding_registry_gtk.cc
diff --git a/chrome/browser/ui/gtk/extensions/extension_keybinding_registry_gtk.cc b/chrome/browser/ui/gtk/extensions/extension_keybinding_registry_gtk.cc
index 13648306d8c1d77ef0f92a91cdbf1883ec5ff217..126b6474007529a1d5428d5517037b225d587360 100644
--- a/chrome/browser/ui/gtk/extensions/extension_keybinding_registry_gtk.cc
+++ b/chrome/browser/ui/gtk/extensions/extension_keybinding_registry_gtk.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_service.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/common/extensions/extension.h"
@@ -23,8 +22,9 @@ bool ExtensionKeybindingRegistryGtk::shortcut_handling_suspended_ = false;
ExtensionKeybindingRegistryGtk::ExtensionKeybindingRegistryGtk(
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),
accel_group_(NULL) {
@@ -170,16 +170,12 @@ gboolean ExtensionKeybindingRegistryGtk::OnGtkAccelerator(
GdkModifierType modifier) {
ui::AcceleratorGtk accelerator(keyval, modifier);
- 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