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 | 8 |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "base/memory/singleton.h" | 10 #include "base/memory/singleton.h" |
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
61 {IDC_ZOOM_MINUS, NSCommandKeyMask, ui::VKEY_OEM_MINUS}, | 61 {IDC_ZOOM_MINUS, NSCommandKeyMask, ui::VKEY_OEM_MINUS}, |
62 {IDC_ZOOM_PLUS, NSCommandKeyMask | NSShiftKeyMask, ui::VKEY_OEM_PLUS}, | 62 {IDC_ZOOM_PLUS, NSCommandKeyMask | NSShiftKeyMask, ui::VKEY_OEM_PLUS}, |
63 | 63 |
64 // Accelerators used in MainMenu.xib, but not the toolbar menu. | 64 // Accelerators used in MainMenu.xib, but not the toolbar menu. |
65 {IDC_HIDE_APP, NSCommandKeyMask, ui::VKEY_H}, | 65 {IDC_HIDE_APP, NSCommandKeyMask, ui::VKEY_H}, |
66 {IDC_EXIT, NSCommandKeyMask, ui::VKEY_Q}, | 66 {IDC_EXIT, NSCommandKeyMask, ui::VKEY_Q}, |
67 {IDC_OPEN_FILE, NSCommandKeyMask, ui::VKEY_O}, | 67 {IDC_OPEN_FILE, NSCommandKeyMask, ui::VKEY_O}, |
68 {IDC_FOCUS_LOCATION, NSCommandKeyMask, ui::VKEY_L}, | 68 {IDC_FOCUS_LOCATION, NSCommandKeyMask, ui::VKEY_L}, |
69 {IDC_CLOSE_WINDOW, NSCommandKeyMask, ui::VKEY_W}, | 69 {IDC_CLOSE_WINDOW, NSCommandKeyMask, ui::VKEY_W}, |
70 {IDC_EMAIL_PAGE_LOCATION, NSCommandKeyMask | NSShiftKeyMask, ui::VKEY_I}, | 70 {IDC_EMAIL_PAGE_LOCATION, NSCommandKeyMask | NSShiftKeyMask, ui::VKEY_I}, |
71 #if !defined(DISABLE_BASIC_PRINTING) | 71 #if defined(ENABLE_BASIC_PRINTING) |
72 {IDC_BASIC_PRINT, NSCommandKeyMask | NSAlternateKeyMask, ui::VKEY_P}, | 72 {IDC_BASIC_PRINT, NSCommandKeyMask | NSAlternateKeyMask, ui::VKEY_P}, |
73 #endif // !DISABLE_BASIC_PRINTING | 73 #endif // ENABLE_BASIC_PRINTING |
74 {IDC_CONTENT_CONTEXT_UNDO, NSCommandKeyMask, ui::VKEY_Z}, | 74 {IDC_CONTENT_CONTEXT_UNDO, NSCommandKeyMask, ui::VKEY_Z}, |
75 {IDC_CONTENT_CONTEXT_REDO, NSCommandKeyMask | NSShiftKeyMask, ui::VKEY_Z}, | 75 {IDC_CONTENT_CONTEXT_REDO, NSCommandKeyMask | NSShiftKeyMask, ui::VKEY_Z}, |
76 {IDC_CONTENT_CONTEXT_CUT, NSCommandKeyMask, ui::VKEY_X}, | 76 {IDC_CONTENT_CONTEXT_CUT, NSCommandKeyMask, ui::VKEY_X}, |
77 {IDC_CONTENT_CONTEXT_COPY, NSCommandKeyMask, ui::VKEY_C}, | 77 {IDC_CONTENT_CONTEXT_COPY, NSCommandKeyMask, ui::VKEY_C}, |
78 {IDC_CONTENT_CONTEXT_PASTE, NSCommandKeyMask, ui::VKEY_V}, | 78 {IDC_CONTENT_CONTEXT_PASTE, NSCommandKeyMask, ui::VKEY_V}, |
79 {IDC_CONTENT_CONTEXT_PASTE_AND_MATCH_STYLE, | 79 {IDC_CONTENT_CONTEXT_PASTE_AND_MATCH_STYLE, |
80 NSCommandKeyMask | NSShiftKeyMask, ui::VKEY_V}, | 80 NSCommandKeyMask | NSShiftKeyMask, ui::VKEY_V}, |
81 {IDC_CONTENT_CONTEXT_SELECTALL, NSCommandKeyMask, ui::VKEY_A}, | 81 {IDC_CONTENT_CONTEXT_SELECTALL, NSCommandKeyMask, ui::VKEY_A}, |
82 {IDC_FOCUS_SEARCH, NSCommandKeyMask | NSAlternateKeyMask, ui::VKEY_F}, | 82 {IDC_FOCUS_SEARCH, NSCommandKeyMask | NSAlternateKeyMask, ui::VKEY_F}, |
83 {IDC_FIND_NEXT, NSCommandKeyMask, ui::VKEY_G}, | 83 {IDC_FIND_NEXT, NSCommandKeyMask, ui::VKEY_G}, |
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
185 NSUInteger mask = platform_accelerator->modifier_mask(); | 185 NSUInteger mask = platform_accelerator->modifier_mask(); |
186 BOOL maskEqual = | 186 BOOL maskEqual = |
187 (mask == modifiers) || ((mask & (~NSShiftKeyMask)) == modifiers); | 187 (mask == modifiers) || ((mask & (~NSShiftKeyMask)) == modifiers); |
188 NSString* string = [NSString stringWithFormat:@"%C", character]; | 188 NSString* string = [NSString stringWithFormat:@"%C", character]; |
189 if ([string isEqual:key_equivalent] && maskEqual) | 189 if ([string isEqual:key_equivalent] && maskEqual) |
190 return &*it; | 190 return &*it; |
191 } | 191 } |
192 | 192 |
193 return NULL; | 193 return NULL; |
194 } | 194 } |
OLD | NEW |