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

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

Issue 10383240: This adds a webui overlay on the extensions page for showing what Extension keybindings are active.… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: 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 | 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/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 29 matching lines...) Expand all
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 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->GetNamedCommands(extension->id(),
51 ExtensionCommandService::ACTIVE_ONLY);
51 extensions::CommandMap::const_iterator iter = commands.begin(); 52 extensions::CommandMap::const_iterator iter = commands.begin();
52 for (; iter != commands.end(); ++iter) { 53 for (; iter != commands.end(); ++iter) {
53 ui::AcceleratorGtk accelerator(iter->second.accelerator().key_code(), 54 ui::AcceleratorGtk accelerator(iter->second.accelerator().key_code(),
54 iter->second.accelerator().IsShiftDown(), 55 iter->second.accelerator().IsShiftDown(),
55 iter->second.accelerator().IsCtrlDown(), 56 iter->second.accelerator().IsCtrlDown(),
56 iter->second.accelerator().IsAltDown()); 57 iter->second.accelerator().IsAltDown());
57 event_targets_[accelerator] = 58 event_targets_[accelerator] =
58 std::make_pair(extension->id(), iter->second.command_name()); 59 std::make_pair(extension->id(), iter->second.command_name());
59 60
60 if (!accel_group_) { 61 if (!accel_group_) {
61 accel_group_ = gtk_accel_group_new(); 62 accel_group_ = gtk_accel_group_new();
62 gtk_window_add_accel_group(window_, accel_group_); 63 gtk_window_add_accel_group(window_, accel_group_);
63 } 64 }
64 65
65 gtk_accel_group_connect( 66 gtk_accel_group_connect(
66 accel_group_, 67 accel_group_,
67 accelerator.GetGdkKeyCode(), 68 accelerator.GetGdkKeyCode(),
68 accelerator.gdk_modifier_type(), 69 accelerator.gdk_modifier_type(),
69 GtkAccelFlags(0), 70 GtkAccelFlags(0),
70 g_cclosure_new(G_CALLBACK(OnGtkAcceleratorThunk), this, NULL)); 71 g_cclosure_new(G_CALLBACK(OnGtkAcceleratorThunk), this, NULL));
71 } 72 }
72 73
73 // Unlike on Windows, we need to explicitly add the browser action and page 74 // Unlike on Windows, we need to explicitly add the browser action and page
74 // action to the event_targets_, even though we don't register them as 75 // action to the event_targets_, even though we don't register them as
75 // handlers. See http://crbug.com/124873. 76 // handlers. See http://crbug.com/124873.
76 const extensions::Command* browser_action = 77 const extensions::Command* browser_action =
77 command_service->GetActiveBrowserActionCommand(extension->id()); 78 command_service->GetBrowserActionCommand(
79 extension->id(), ExtensionCommandService::ACTIVE_ONLY);
78 if (browser_action) { 80 if (browser_action) {
79 ui::AcceleratorGtk accelerator(browser_action->accelerator().key_code(), 81 ui::AcceleratorGtk accelerator(browser_action->accelerator().key_code(),
80 browser_action->accelerator().IsShiftDown(), 82 browser_action->accelerator().IsShiftDown(),
81 browser_action->accelerator().IsCtrlDown(), 83 browser_action->accelerator().IsCtrlDown(),
82 browser_action->accelerator().IsAltDown()); 84 browser_action->accelerator().IsAltDown());
83 event_targets_[accelerator] = 85 event_targets_[accelerator] =
84 std::make_pair(extension->id(), browser_action->command_name()); 86 std::make_pair(extension->id(), browser_action->command_name());
85 } 87 }
86 88
87 const extensions::Command* page_action = 89 const extensions::Command* page_action =
88 command_service->GetActivePageActionCommand(extension->id()); 90 command_service->GetPageActionCommand(
91 extension->id(), ExtensionCommandService::ACTIVE_ONLY);
89 if (page_action) { 92 if (page_action) {
90 ui::AcceleratorGtk accelerator(page_action->accelerator().key_code(), 93 ui::AcceleratorGtk accelerator(page_action->accelerator().key_code(),
91 page_action->accelerator().IsShiftDown(), 94 page_action->accelerator().IsShiftDown(),
92 page_action->accelerator().IsCtrlDown(), 95 page_action->accelerator().IsCtrlDown(),
93 page_action->accelerator().IsAltDown()); 96 page_action->accelerator().IsAltDown());
94 event_targets_[accelerator] = 97 event_targets_[accelerator] =
95 std::make_pair(extension->id(), page_action->command_name()); 98 std::make_pair(extension->id(), page_action->command_name());
96 } 99 }
97 } 100 }
98 101
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 if (it == event_targets_.end()) { 136 if (it == event_targets_.end()) {
134 NOTREACHED(); // Shouldn't get this event for something not registered. 137 NOTREACHED(); // Shouldn't get this event for something not registered.
135 return FALSE; 138 return FALSE;
136 } 139 }
137 140
138 service->browser_event_router()->CommandExecuted( 141 service->browser_event_router()->CommandExecuted(
139 profile_, it->second.first, it->second.second); 142 profile_, it->second.first, it->second.second);
140 143
141 return TRUE; 144 return TRUE;
142 } 145 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698