Index: chrome/browser/ui/cocoa/accelerators_cocoa.h |
diff --git a/chrome/browser/ui/cocoa/accelerators_cocoa.h b/chrome/browser/ui/cocoa/accelerators_cocoa.h |
index b2d226964fed35d8a5bb1bca48ef7cd846988304..9b0a5558b351d95bdaa2ca1f20b7523f614f9f2d 100644 |
--- a/chrome/browser/ui/cocoa/accelerators_cocoa.h |
+++ b/chrome/browser/ui/cocoa/accelerators_cocoa.h |
@@ -10,6 +10,8 @@ |
#include "app/menus/accelerator_cocoa.h" |
+template <typename T> struct DefaultSingletonTraits; |
+ |
// This class maintains a map of command_ids to AcceleratorCocoa objects (see |
// chrome/app/chrome_command_ids.h). Currently, this only lists the commands |
// that are used in the Wrench menu. |
@@ -19,20 +21,25 @@ |
// |
// #import "base/singleton.h" |
// ... |
-// AcceleratorsCocoa* keymap = Singleton<AcceleratorsCocoa>::get(); |
+// AcceleratorsCocoa* keymap = AcceleratorsCocoa::GetInstance(); |
// return keymap->GetAcceleratorForCommand(IDC_COPY); |
// |
class AcceleratorsCocoa { |
public: |
- AcceleratorsCocoa(); |
- ~AcceleratorsCocoa() {} |
- |
typedef std::map<int, menus::AcceleratorCocoa> AcceleratorCocoaMap; |
// Returns NULL if there is no accelerator for the command. |
const menus::AcceleratorCocoa* GetAcceleratorForCommand(int command_id); |
+ // Returns the singleton instance. |
+ static AcceleratorsCocoa* GetInstance(); |
+ |
private: |
+ friend struct DefaultSingletonTraits<AcceleratorsCocoa>; |
+ |
+ AcceleratorsCocoa(); |
+ ~AcceleratorsCocoa() {} |
+ |
AcceleratorCocoaMap accelerators_; |
DISALLOW_COPY_AND_ASSIGN(AcceleratorsCocoa); |