Access singletons with a new GetInstance() method instead of Singleton<T>.

gfx/window_impl.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "gfx/window_impl.h"
 
 #include <list>
 
 #include "base/singleton.h"
 #include "base/string_number_conversions.h"
@@ skipping 24 matching lines @@
         background(NULL) {}
 
   // Compares two ClassInfos. Returns true if all members match.
   bool Equals(const ClassInfo& other) const {
     return (other.style == style && other.background == background);
   }
 };
 
 class ClassRegistrar {
  public:
+  static ClassRegistrar* GetInstance() {
+    return Singleton<ClassRegistrar>::get();
+  }
+
   ~ClassRegistrar() {
     for (RegisteredClasses::iterator i = registered_classes_.begin();
          i != registered_classes_.end(); ++i) {
       UnregisterClass(i->name.c_str(), NULL);
     }
   }
 
   // Puts the name for the class matching |class_info| in |class_name|, creating
   // a new name if the class is not yet known.
   // Returns true if this class was already known, false otherwise.
@@ skipping 136 matching lines @@
       win_util::GetWindowUserData(hwnd));
   if (!window)
     return 0;
 
   return window->OnWndProc(message, w_param, l_param);
 }
 
 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.
   WNDCLASSEX class_ex;
   class_ex.cbSize = sizeof(WNDCLASSEX);
   class_ex.style = class_info.style;
   class_ex.lpfnWndProc = &WindowImpl::WndProc;
   class_ex.cbClsExtra = 0;
   class_ex.cbWndExtra = 0;
   class_ex.hInstance = NULL;
   class_ex.hIcon = GetDefaultWindowIcon();
   class_ex.hCursor = LoadCursor(NULL, IDC_ARROW);
   class_ex.hbrBackground = reinterpret_cast<HBRUSH>(class_info.background + 1);
   class_ex.lpszMenuName = NULL;
   class_ex.lpszClassName = name.c_str();
   class_ex.hIconSm = class_ex.hIcon;
   ATOM atom = RegisterClassEx(&class_ex);
   DCHECK(atom);
 
   Singleton<ClassRegistrar>()->RegisterClass(class_info, name, atom);
 
   return name;
 }
 
 }  // namespace gfx