Index: chrome/browser/extensions/global_shortcut_listener_win.cc |
diff --git a/chrome/browser/extensions/global_shortcut_listener_win.cc b/chrome/browser/extensions/global_shortcut_listener_win.cc |
index a5987f7ab9eca678c502dd225cbfb78170a760dc..16fb4b370040390fa8ac3dc2d184e9b80a9370d4 100644 |
--- a/chrome/browser/extensions/global_shortcut_listener_win.cc |
+++ b/chrome/browser/extensions/global_shortcut_listener_win.cc |
@@ -72,6 +72,9 @@ void GlobalShortcutListenerWin::OnWndProc(HWND hwnd, |
void GlobalShortcutListenerWin::RegisterAccelerator( |
const ui::Accelerator& accelerator, |
GlobalShortcutListener::Observer* observer) { |
+ if (hotkey_ids_.find(accelerator) != hotkey_ids_.end()) |
+ return; // The shortcut has been registered. |
Finnur
2013/11/12 16:27:54
Perhaps document that this is because some shortcu
zhchbin
2013/11/13 05:01:57
Done.
|
+ |
int modifiers = 0; |
modifiers |= accelerator.IsShiftDown() ? MOD_SHIFT : 0; |
modifiers |= accelerator.IsCtrlDown() ? MOD_CONTROL : 0; |