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/memory/singleton.h" | 9 #include "base/memory/singleton.h" |
10 #include "chrome/app/chrome_command_ids.h" | 10 #include "chrome/app/chrome_command_ids.h" |
(...skipping 11 matching lines...) Expand all Loading... |
22 { IDC_DEV_TOOLS, @"i", NSCommandKeyMask | NSAlternateKeyMask }, | 22 { IDC_DEV_TOOLS, @"i", NSCommandKeyMask | NSAlternateKeyMask }, |
23 { IDC_DEV_TOOLS_CONSOLE, @"j", NSCommandKeyMask | NSAlternateKeyMask }, | 23 { IDC_DEV_TOOLS_CONSOLE, @"j", NSCommandKeyMask | NSAlternateKeyMask }, |
24 { IDC_FIND, @"f", NSCommandKeyMask }, | 24 { IDC_FIND, @"f", NSCommandKeyMask }, |
25 { IDC_FULLSCREEN, @"f", NSCommandKeyMask | NSShiftKeyMask }, | 25 { IDC_FULLSCREEN, @"f", NSCommandKeyMask | NSShiftKeyMask }, |
26 { IDC_NEW_INCOGNITO_WINDOW, @"n", NSCommandKeyMask | NSShiftKeyMask }, | 26 { IDC_NEW_INCOGNITO_WINDOW, @"n", NSCommandKeyMask | NSShiftKeyMask }, |
27 { IDC_NEW_TAB, @"t", NSCommandKeyMask }, | 27 { IDC_NEW_TAB, @"t", NSCommandKeyMask }, |
28 { IDC_NEW_WINDOW, @"n", NSCommandKeyMask }, | 28 { IDC_NEW_WINDOW, @"n", NSCommandKeyMask }, |
29 { IDC_OPTIONS, @",", NSCommandKeyMask }, | 29 { IDC_OPTIONS, @",", NSCommandKeyMask }, |
30 { IDC_PASTE, @"v", NSCommandKeyMask }, | 30 { IDC_PASTE, @"v", NSCommandKeyMask }, |
31 { IDC_PRINT, @"p", NSCommandKeyMask }, | 31 { IDC_PRINT, @"p", NSCommandKeyMask }, |
| 32 { IDC_ADVANCED_PRINT, @"p", NSCommandKeyMask | NSShiftKeyMask }, |
32 { IDC_SAVE_PAGE, @"s", NSCommandKeyMask }, | 33 { IDC_SAVE_PAGE, @"s", NSCommandKeyMask }, |
33 { IDC_SHOW_BOOKMARK_BAR, @"b", NSCommandKeyMask | NSShiftKeyMask }, | 34 { IDC_SHOW_BOOKMARK_BAR, @"b", NSCommandKeyMask | NSShiftKeyMask }, |
34 { IDC_SHOW_BOOKMARK_MANAGER, @"b", NSCommandKeyMask | NSAlternateKeyMask }, | 35 { IDC_SHOW_BOOKMARK_MANAGER, @"b", NSCommandKeyMask | NSAlternateKeyMask }, |
35 { IDC_SHOW_DOWNLOADS, @"j", NSCommandKeyMask | NSShiftKeyMask }, | 36 { IDC_SHOW_DOWNLOADS, @"j", NSCommandKeyMask | NSShiftKeyMask }, |
36 { IDC_SHOW_HISTORY, @"y", NSCommandKeyMask }, | 37 { IDC_SHOW_HISTORY, @"y", NSCommandKeyMask }, |
37 { IDC_VIEW_SOURCE, @"u", NSCommandKeyMask | NSAlternateKeyMask }, | 38 { IDC_VIEW_SOURCE, @"u", NSCommandKeyMask | NSAlternateKeyMask }, |
38 { IDC_ZOOM_MINUS, @"-", NSCommandKeyMask }, | 39 { IDC_ZOOM_MINUS, @"-", NSCommandKeyMask }, |
39 { IDC_ZOOM_PLUS, @"+", NSCommandKeyMask } | 40 { IDC_ZOOM_PLUS, @"+", NSCommandKeyMask } |
40 }; | 41 }; |
41 | 42 |
(...skipping 14 matching lines...) Expand all Loading... |
56 return Singleton<AcceleratorsCocoa>::get(); | 57 return Singleton<AcceleratorsCocoa>::get(); |
57 } | 58 } |
58 | 59 |
59 const ui::AcceleratorCocoa* AcceleratorsCocoa::GetAcceleratorForCommand( | 60 const ui::AcceleratorCocoa* AcceleratorsCocoa::GetAcceleratorForCommand( |
60 int command_id) { | 61 int command_id) { |
61 AcceleratorCocoaMap::iterator it = accelerators_.find(command_id); | 62 AcceleratorCocoaMap::iterator it = accelerators_.find(command_id); |
62 if (it == accelerators_.end()) | 63 if (it == accelerators_.end()) |
63 return NULL; | 64 return NULL; |
64 return &it->second; | 65 return &it->second; |
65 } | 66 } |
OLD | NEW |