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

Side by Side Diff: chrome/browser/ui/gtk/extensions/extension_keybinding_registry_gtk.cc

Issue 10375021: Move Extension into extensions namespace (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Take 6 Created 8 years, 7 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
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/gtk/extensions/extension_keybinding_registry_gtk.h" 5 #include "chrome/browser/ui/gtk/extensions/extension_keybinding_registry_gtk.h"
6 6
7 #include "chrome/browser/extensions/api/commands/extension_command_service.h" 7 #include "chrome/browser/extensions/api/commands/extension_command_service.h"
8 #include "chrome/browser/extensions/api/commands/extension_command_service_facto ry.h" 8 #include "chrome/browser/extensions/api/commands/extension_command_service_facto ry.h"
9 #include "chrome/browser/extensions/extension_browser_event_router.h" 9 #include "chrome/browser/extensions/extension_browser_event_router.h"
10 #include "chrome/browser/extensions/extension_service.h" 10 #include "chrome/browser/extensions/extension_service.h"
(...skipping 25 matching lines...) Expand all
36 gboolean ExtensionKeybindingRegistryGtk::HasPriorityHandler( 36 gboolean ExtensionKeybindingRegistryGtk::HasPriorityHandler(
37 const GdkEventKey* event) const { 37 const GdkEventKey* event) const {
38 ui::AcceleratorGtk accelerator(ui::WindowsKeyCodeForGdkKeyCode(event->keyval), 38 ui::AcceleratorGtk accelerator(ui::WindowsKeyCodeForGdkKeyCode(event->keyval),
39 event->state & GDK_SHIFT_MASK, 39 event->state & GDK_SHIFT_MASK,
40 event->state & GDK_CONTROL_MASK, 40 event->state & GDK_CONTROL_MASK,
41 event->state & GDK_MOD1_MASK); 41 event->state & GDK_MOD1_MASK);
42 return event_targets_.find(accelerator) != event_targets_.end(); 42 return event_targets_.find(accelerator) != event_targets_.end();
43 } 43 }
44 44
45 void ExtensionKeybindingRegistryGtk::AddExtensionKeybinding( 45 void ExtensionKeybindingRegistryGtk::AddExtensionKeybinding(
46 const Extension* extension) { 46 const extensions::Extension* extension) {
47 ExtensionCommandService* command_service = 47 ExtensionCommandService* command_service =
48 ExtensionCommandServiceFactory::GetForProfile(profile_); 48 ExtensionCommandServiceFactory::GetForProfile(profile_);
49 const extensions::CommandMap& commands = 49 const extensions::CommandMap& commands =
50 command_service->GetActiveNamedCommands(extension->id()); 50 command_service->GetActiveNamedCommands(extension->id());
51 extensions::CommandMap::const_iterator iter = commands.begin(); 51 extensions::CommandMap::const_iterator iter = commands.begin();
52 for (; iter != commands.end(); ++iter) { 52 for (; iter != commands.end(); ++iter) {
53 ui::AcceleratorGtk accelerator(iter->second.accelerator().key_code(), 53 ui::AcceleratorGtk accelerator(iter->second.accelerator().key_code(),
54 iter->second.accelerator().IsShiftDown(), 54 iter->second.accelerator().IsShiftDown(),
55 iter->second.accelerator().IsCtrlDown(), 55 iter->second.accelerator().IsCtrlDown(),
56 iter->second.accelerator().IsAltDown()); 56 iter->second.accelerator().IsAltDown());
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 ui::AcceleratorGtk accelerator(page_action->accelerator().key_code(), 90 ui::AcceleratorGtk accelerator(page_action->accelerator().key_code(),
91 page_action->accelerator().IsShiftDown(), 91 page_action->accelerator().IsShiftDown(),
92 page_action->accelerator().IsCtrlDown(), 92 page_action->accelerator().IsCtrlDown(),
93 page_action->accelerator().IsAltDown()); 93 page_action->accelerator().IsAltDown());
94 event_targets_[accelerator] = 94 event_targets_[accelerator] =
95 std::make_pair(extension->id(), page_action->command_name()); 95 std::make_pair(extension->id(), page_action->command_name());
96 } 96 }
97 } 97 }
98 98
99 void ExtensionKeybindingRegistryGtk::RemoveExtensionKeybinding( 99 void ExtensionKeybindingRegistryGtk::RemoveExtensionKeybinding(
100 const Extension* extension) { 100 const extensions::Extension* extension) {
101 EventTargets::iterator iter = event_targets_.begin(); 101 EventTargets::iterator iter = event_targets_.begin();
102 while (iter != event_targets_.end()) { 102 while (iter != event_targets_.end()) {
103 if (iter->second.first != extension->id()) { 103 if (iter->second.first != extension->id()) {
104 ++iter; 104 ++iter;
105 continue; // Not the extension we asked for. 105 continue; // Not the extension we asked for.
106 } 106 }
107 107
108 // On GTK, unlike Windows, the Event Targets contain all events but we must 108 // On GTK, unlike Windows, the Event Targets contain all events but we must
109 // only unregister the ones we own. 109 // only unregister the ones we own.
110 if (ShouldIgnoreCommand(iter->second.second)) { 110 if (ShouldIgnoreCommand(iter->second.second)) {
(...skipping 22 matching lines...) Expand all
133 if (it == event_targets_.end()) { 133 if (it == event_targets_.end()) {
134 NOTREACHED(); // Shouldn't get this event for something not registered. 134 NOTREACHED(); // Shouldn't get this event for something not registered.
135 return FALSE; 135 return FALSE;
136 } 136 }
137 137
138 service->browser_event_router()->CommandExecuted( 138 service->browser_event_router()->CommandExecuted(
139 profile_, it->second.first, it->second.second); 139 profile_, it->second.first, it->second.second);
140 140
141 return TRUE; 141 return TRUE;
142 } 142 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698