This CL add a GetInstance() method to singleton classes instead of relying on the callers to use Singleton<T>.

In some cases I have used the LazyInstance<T> pattern as that was simpler.

This is a small step towards making all singleton classes use the Singleton<T> pattern within their code and not expect the callers to know about it.

I have selected all files under src/app and src/base which use Singleton<T> in this CL. Once this CL goes in I'll work on the rest of the files.

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

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

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

1 files changed, 5 insertions, 1 deletions

diff --git a/gfx/window_impl.cc b/gfx/window_impl.cc
index 74e0e20..95561ff 100644
--- a/gfx/window_impl.cc
+++ b/gfx/window_impl.cc
@@ -42,6 +42,10 @@ struct ClassInfo {
 
 class ClassRegistrar {
  public:
+  static ClassRegistrar* GetInstance() {
+    return Singleton<ClassRegistrar>::get();
+  }
+
   ~ClassRegistrar() {
     for (RegisteredClasses::iterator i = registered_classes_.begin();
          i != registered_classes_.end(); ++i) {
@@ -198,7 +202,7 @@ LRESULT CALLBACK WindowImpl::WndProc(HWND hwnd,
 std::wstring WindowImpl::GetWindowClassName() {
   ClassInfo class_info(initial_class_style());
   std::wstring name;
-  if (Singleton<ClassRegistrar>()->RetrieveClassName(class_info, &name))
+  if (ClassRegistrar::GetInstance()->RetrieveClassName(class_info, &name))
     return name;
 
   // No class found, need to register one.