This is a continuation of http://codereview.chromium.org/5519016/, adds a new GetInstance() method for remaining files with singleton classes under chrome/browser.

For types declared and used within the same .cc file, I changed them over to LazyInstance<T>.

BUG=65298
TEST=all existing tests should continue to pass.

Review URL: http://codereview.chromium.org/5711001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68739 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 11 insertions, 4 deletions

diff --git a/chrome/browser/ui/cocoa/accelerators_cocoa.h b/chrome/browser/ui/cocoa/accelerators_cocoa.h
index b2d2269..9b0a555 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);