Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(79)

Side by Side Diff: chrome/browser/ui/cocoa/accelerators_cocoa.mm

Issue 6546073: More OOLing on Mac. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Yeap Created 9 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/singleton.h" 9 #include "base/singleton.h"
10 #include "chrome/app/chrome_command_ids.h" 10 #include "chrome/app/chrome_command_ids.h"
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 } // namespace 42 } // namespace
43 43
44 AcceleratorsCocoa::AcceleratorsCocoa() { 44 AcceleratorsCocoa::AcceleratorsCocoa() {
45 for (size_t i = 0; i < arraysize(kAcceleratorMap); ++i) { 45 for (size_t i = 0; i < arraysize(kAcceleratorMap); ++i) {
46 const AcceleratorMapping& entry = kAcceleratorMap[i]; 46 const AcceleratorMapping& entry = kAcceleratorMap[i];
47 ui::AcceleratorCocoa accelerator(entry.key, entry.modifiers); 47 ui::AcceleratorCocoa accelerator(entry.key, entry.modifiers);
48 accelerators_.insert(std::make_pair(entry.command_id, accelerator)); 48 accelerators_.insert(std::make_pair(entry.command_id, accelerator));
49 } 49 }
50 } 50 }
51 51
52 AcceleratorsCocoa::~AcceleratorsCocoa() {}
53
52 // static 54 // static
53 AcceleratorsCocoa* AcceleratorsCocoa::GetInstance() { 55 AcceleratorsCocoa* AcceleratorsCocoa::GetInstance() {
54 return Singleton<AcceleratorsCocoa>::get(); 56 return Singleton<AcceleratorsCocoa>::get();
55 } 57 }
56 58
57 const ui::AcceleratorCocoa* AcceleratorsCocoa::GetAcceleratorForCommand( 59 const ui::AcceleratorCocoa* AcceleratorsCocoa::GetAcceleratorForCommand(
58 int command_id) { 60 int command_id) {
59 AcceleratorCocoaMap::iterator it = accelerators_.find(command_id); 61 AcceleratorCocoaMap::iterator it = accelerators_.find(command_id);
60 if (it == accelerators_.end()) 62 if (it == accelerators_.end())
61 return NULL; 63 return NULL;
62 return &it->second; 64 return &it->second;
63 } 65 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/accelerators_cocoa.h ('k') | chrome/browser/ui/cocoa/browser_test_helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698