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

Side by Side 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: update GTK with the TabContents changes 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/views/extensions/extension_keybinding_registry_views .h" 5 #include "chrome/browser/ui/views/extensions/extension_keybinding_registry_views .h"
6 6
7 #include "chrome/browser/extensions/api/commands/command_service.h" 7 #include "chrome/browser/extensions/api/commands/command_service.h"
8 #include "chrome/browser/extensions/api/commands/command_service_factory.h" 8 #include "chrome/browser/extensions/api/commands/command_service_factory.h"
9 #include "chrome/browser/extensions/browser_event_router.h" 9 #include "chrome/browser/extensions/browser_event_router.h"
Finnur 2012/09/21 10:07:00 Can this be removed now?
not at google - send to devlin 2012/09/23 23:53:18 Done.
10 #include "chrome/browser/extensions/extension_keybinding_registry.h" 10 #include "chrome/browser/extensions/extension_keybinding_registry.h"
11 #include "chrome/browser/extensions/extension_service.h" 11 #include "chrome/browser/extensions/extension_service.h"
12 #include "chrome/browser/profiles/profile.h" 12 #include "chrome/browser/profiles/profile.h"
13 #include "chrome/common/extensions/extension.h" 13 #include "chrome/common/extensions/extension.h"
14 #include "ui/views/focus/focus_manager.h" 14 #include "ui/views/focus/focus_manager.h"
15 15
16 // static 16 // static
17 void extensions::ExtensionKeybindingRegistry::SetShortcutHandlingSuspended( 17 void extensions::ExtensionKeybindingRegistry::SetShortcutHandlingSuspended(
18 bool suspended) { 18 bool suspended) {
19 views::FocusManager::set_shortcut_handling_suspended(suspended); 19 views::FocusManager::set_shortcut_handling_suspended(suspended);
20 } 20 }
21 21
22 ExtensionKeybindingRegistryViews::ExtensionKeybindingRegistryViews( 22 ExtensionKeybindingRegistryViews::ExtensionKeybindingRegistryViews(
23 Profile* profile, 23 Profile* profile,
24 views::FocusManager* focus_manager, 24 views::FocusManager* focus_manager,
25 ExtensionFilter extension_filter) 25 ExtensionFilter extension_filter,
26 : ExtensionKeybindingRegistry(profile, extension_filter), 26 Delegate* delegate)
27 : ExtensionKeybindingRegistry(profile, extension_filter, delegate),
27 profile_(profile), 28 profile_(profile),
28 focus_manager_(focus_manager) { 29 focus_manager_(focus_manager) {
29 Init(); 30 Init();
30 } 31 }
31 32
32 ExtensionKeybindingRegistryViews::~ExtensionKeybindingRegistryViews() { 33 ExtensionKeybindingRegistryViews::~ExtensionKeybindingRegistryViews() {
33 EventTargets::const_iterator iter; 34 EventTargets::const_iterator iter;
34 for (iter = event_targets_.begin(); iter != event_targets_.end(); ++iter) 35 for (iter = event_targets_.begin(); iter != event_targets_.end(); ++iter)
35 focus_manager_->UnregisterAccelerator(iter->first, this); 36 focus_manager_->UnregisterAccelerator(iter->first, this);
36 } 37 }
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 81
81 focus_manager_->UnregisterAccelerator(iter->first, this); 82 focus_manager_->UnregisterAccelerator(iter->first, this);
82 83
83 EventTargets::iterator old = iter++; 84 EventTargets::iterator old = iter++;
84 event_targets_.erase(old); 85 event_targets_.erase(old);
85 } 86 }
86 } 87 }
87 88
88 bool ExtensionKeybindingRegistryViews::AcceleratorPressed( 89 bool ExtensionKeybindingRegistryViews::AcceleratorPressed(
89 const ui::Accelerator& accelerator) { 90 const ui::Accelerator& accelerator) {
90 ExtensionService* service = profile_->GetExtensionService();
91
92 EventTargets::iterator it = event_targets_.find(accelerator); 91 EventTargets::iterator it = event_targets_.find(accelerator);
93 if (it == event_targets_.end()) { 92 if (it == event_targets_.end()) {
94 NOTREACHED(); // Shouldn't get this event for something not registered. 93 NOTREACHED(); // Shouldn't get this event for something not registered.
95 return false; 94 return false;
96 } 95 }
97 96
98 service->browser_event_router()->CommandExecuted( 97 CommandExecuted(it->second.first, it->second.second);
99 profile_, it->second.first, it->second.second);
100 98
101 return true; 99 return true;
102 } 100 }
103 101
104 bool ExtensionKeybindingRegistryViews::CanHandleAccelerators() const { 102 bool ExtensionKeybindingRegistryViews::CanHandleAccelerators() const {
105 return true; 103 return true;
106 } 104 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698