OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/cocoa/accelerators_cocoa.h" | 5 #include "chrome/browser/ui/cocoa/accelerators_cocoa.h" |
6 | 6 |
7 #import <Cocoa/Cocoa.h> | 7 #import <Cocoa/Cocoa.h> |
8 #include <stddef.h> | 8 #include <stddef.h> |
9 | 9 |
10 #include <utility> | 10 #include <utility> |
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
84 NSCommandKeyMask | NSShiftKeyMask, ui::VKEY_V}, | 84 NSCommandKeyMask | NSShiftKeyMask, ui::VKEY_V}, |
85 {IDC_CONTENT_CONTEXT_SELECTALL, NSCommandKeyMask, ui::VKEY_A}, | 85 {IDC_CONTENT_CONTEXT_SELECTALL, NSCommandKeyMask, ui::VKEY_A}, |
86 {IDC_FOCUS_SEARCH, NSCommandKeyMask | NSAlternateKeyMask, ui::VKEY_F}, | 86 {IDC_FOCUS_SEARCH, NSCommandKeyMask | NSAlternateKeyMask, ui::VKEY_F}, |
87 {IDC_FIND_NEXT, NSCommandKeyMask, ui::VKEY_G}, | 87 {IDC_FIND_NEXT, NSCommandKeyMask, ui::VKEY_G}, |
88 {IDC_FIND_PREVIOUS, NSCommandKeyMask | NSShiftKeyMask, ui::VKEY_G}, | 88 {IDC_FIND_PREVIOUS, NSCommandKeyMask | NSShiftKeyMask, ui::VKEY_G}, |
89 {IDC_ZOOM_PLUS, NSCommandKeyMask, ui::VKEY_OEM_PLUS}, | 89 {IDC_ZOOM_PLUS, NSCommandKeyMask, ui::VKEY_OEM_PLUS}, |
90 {IDC_ZOOM_MINUS, NSCommandKeyMask, ui::VKEY_OEM_MINUS}, | 90 {IDC_ZOOM_MINUS, NSCommandKeyMask, ui::VKEY_OEM_MINUS}, |
91 {IDC_STOP, NSCommandKeyMask, ui::VKEY_OEM_PERIOD}, | 91 {IDC_STOP, NSCommandKeyMask, ui::VKEY_OEM_PERIOD}, |
92 {IDC_RELOAD, NSCommandKeyMask, ui::VKEY_R}, | 92 {IDC_RELOAD, NSCommandKeyMask, ui::VKEY_R}, |
93 {IDC_RELOAD_BYPASSING_CACHE, NSCommandKeyMask | NSShiftKeyMask, ui::VKEY_R}, | 93 {IDC_RELOAD_BYPASSING_CACHE, NSCommandKeyMask | NSShiftKeyMask, ui::VKEY_R}, |
94 {IDC_PRESENTATION_MODE, NSCommandKeyMask | NSShiftKeyMask, ui::VKEY_F}, | |
95 {IDC_ZOOM_NORMAL, NSCommandKeyMask, ui::VKEY_0}, | 94 {IDC_ZOOM_NORMAL, NSCommandKeyMask, ui::VKEY_0}, |
96 {IDC_HOME, NSCommandKeyMask | NSShiftKeyMask, ui::VKEY_H}, | 95 {IDC_HOME, NSCommandKeyMask | NSShiftKeyMask, ui::VKEY_H}, |
97 {IDC_BACK, NSCommandKeyMask, ui::VKEY_OEM_4}, | 96 {IDC_BACK, NSCommandKeyMask, ui::VKEY_OEM_4}, |
98 {IDC_FORWARD, NSCommandKeyMask, ui::VKEY_OEM_6}, | 97 {IDC_FORWARD, NSCommandKeyMask, ui::VKEY_OEM_6}, |
99 {IDC_BOOKMARK_ALL_TABS, NSCommandKeyMask | NSShiftKeyMask, ui::VKEY_D}, | 98 {IDC_BOOKMARK_ALL_TABS, NSCommandKeyMask | NSShiftKeyMask, ui::VKEY_D}, |
100 {IDC_MINIMIZE_WINDOW, NSCommandKeyMask, ui::VKEY_M}, | 99 {IDC_MINIMIZE_WINDOW, NSCommandKeyMask, ui::VKEY_M}, |
101 {IDC_SELECT_NEXT_TAB, NSCommandKeyMask | NSAlternateKeyMask, ui::VKEY_RIGHT}, | 100 {IDC_SELECT_NEXT_TAB, NSCommandKeyMask | NSAlternateKeyMask, ui::VKEY_RIGHT}, |
102 {IDC_SELECT_PREVIOUS_TAB, NSCommandKeyMask | NSAlternateKeyMask, | 101 {IDC_SELECT_PREVIOUS_TAB, NSCommandKeyMask | NSAlternateKeyMask, |
103 ui::VKEY_LEFT}, | 102 ui::VKEY_LEFT}, |
104 {IDC_HELP_PAGE_VIA_MENU, NSCommandKeyMask | NSShiftKeyMask, ui::VKEY_OEM_2}, | 103 {IDC_HELP_PAGE_VIA_MENU, NSCommandKeyMask | NSShiftKeyMask, ui::VKEY_OEM_2}, |
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
186 NSUInteger mask = platform_accelerator->modifier_mask(); | 185 NSUInteger mask = platform_accelerator->modifier_mask(); |
187 BOOL maskEqual = | 186 BOOL maskEqual = |
188 (mask == modifiers) || ((mask & (~NSShiftKeyMask)) == modifiers); | 187 (mask == modifiers) || ((mask & (~NSShiftKeyMask)) == modifiers); |
189 NSString* string = [NSString stringWithFormat:@"%C", shifted_character]; | 188 NSString* string = [NSString stringWithFormat:@"%C", shifted_character]; |
190 if ([string isEqual:key_equivalent] && maskEqual) | 189 if ([string isEqual:key_equivalent] && maskEqual) |
191 return &*it; | 190 return &*it; |
192 } | 191 } |
193 | 192 |
194 return NULL; | 193 return NULL; |
195 } | 194 } |
OLD | NEW |