| 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 16 matching lines...) Expand all Loading... |
| 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_SAVE_PAGE, @"s", NSCommandKeyMask }, | 32 { IDC_SAVE_PAGE, @"s", NSCommandKeyMask }, |
| 33 { IDC_SHOW_BOOKMARK_BAR, @"b", NSCommandKeyMask | NSShiftKeyMask }, | 33 { IDC_SHOW_BOOKMARK_BAR, @"b", NSCommandKeyMask | NSShiftKeyMask }, |
| 34 { IDC_SHOW_BOOKMARK_MANAGER, @"b", NSCommandKeyMask | NSAlternateKeyMask }, | 34 { IDC_SHOW_BOOKMARK_MANAGER, @"b", NSCommandKeyMask | NSAlternateKeyMask }, |
| 35 { IDC_SHOW_DOWNLOADS, @"j", NSCommandKeyMask | NSShiftKeyMask }, | 35 { IDC_SHOW_DOWNLOADS, @"j", NSCommandKeyMask | NSShiftKeyMask }, |
| 36 { IDC_SHOW_HISTORY, @"y", NSCommandKeyMask }, | 36 { IDC_SHOW_HISTORY, @"y", NSCommandKeyMask }, |
| 37 { IDC_TOGGLE_SPEECH_INPUT, @".", NSCommandKeyMask | NSShiftKeyMask }, | |
| 38 { IDC_VIEW_SOURCE, @"u", NSCommandKeyMask | NSAlternateKeyMask }, | 37 { IDC_VIEW_SOURCE, @"u", NSCommandKeyMask | NSAlternateKeyMask }, |
| 39 { IDC_ZOOM_MINUS, @"-", NSCommandKeyMask }, | 38 { IDC_ZOOM_MINUS, @"-", NSCommandKeyMask }, |
| 40 { IDC_ZOOM_PLUS, @"+", NSCommandKeyMask } | 39 { IDC_ZOOM_PLUS, @"+", NSCommandKeyMask } |
| 41 }; | 40 }; |
| 42 | 41 |
| 43 } // namespace | 42 } // namespace |
| 44 | 43 |
| 45 AcceleratorsCocoa::AcceleratorsCocoa() { | 44 AcceleratorsCocoa::AcceleratorsCocoa() { |
| 46 for (size_t i = 0; i < arraysize(kAcceleratorMap); ++i) { | 45 for (size_t i = 0; i < arraysize(kAcceleratorMap); ++i) { |
| 47 const AcceleratorMapping& entry = kAcceleratorMap[i]; | 46 const AcceleratorMapping& entry = kAcceleratorMap[i]; |
| 48 ui::AcceleratorCocoa accelerator(entry.key, entry.modifiers); | 47 ui::AcceleratorCocoa accelerator(entry.key, entry.modifiers); |
| 49 accelerators_.insert(std::make_pair(entry.command_id, accelerator)); | 48 accelerators_.insert(std::make_pair(entry.command_id, accelerator)); |
| 50 } | 49 } |
| 51 } | 50 } |
| 52 | 51 |
| 53 AcceleratorsCocoa::~AcceleratorsCocoa() {} | 52 AcceleratorsCocoa::~AcceleratorsCocoa() {} |
| 54 | 53 |
| 55 // static | 54 // static |
| 56 AcceleratorsCocoa* AcceleratorsCocoa::GetInstance() { | 55 AcceleratorsCocoa* AcceleratorsCocoa::GetInstance() { |
| 57 return Singleton<AcceleratorsCocoa>::get(); | 56 return Singleton<AcceleratorsCocoa>::get(); |
| 58 } | 57 } |
| 59 | 58 |
| 60 const ui::AcceleratorCocoa* AcceleratorsCocoa::GetAcceleratorForCommand( | 59 const ui::AcceleratorCocoa* AcceleratorsCocoa::GetAcceleratorForCommand( |
| 61 int command_id) { | 60 int command_id) { |
| 62 AcceleratorCocoaMap::iterator it = accelerators_.find(command_id); | 61 AcceleratorCocoaMap::iterator it = accelerators_.find(command_id); |
| 63 if (it == accelerators_.end()) | 62 if (it == accelerators_.end()) |
| 64 return NULL; | 63 return NULL; |
| 65 return &it->second; | 64 return &it->second; |
| 66 } | 65 } |
| OLD | NEW |