| Index: ui/gfx/win/window_impl.cc
|
| diff --git a/ui/gfx/win/window_impl.cc b/ui/gfx/win/window_impl.cc
|
| index 97da6f94f86f9c537683e9b70d6635b3bb9c68c8..375434f98ad30d4943653da06add87a3736d7713 100644
|
| --- a/ui/gfx/win/window_impl.cc
|
| +++ b/ui/gfx/win/window_impl.cc
|
| @@ -81,7 +81,7 @@ class ClassRegistrar {
|
| };
|
|
|
| ClassRegistrar();
|
| - friend struct DefaultSingletonTraits<ClassRegistrar>;
|
| + friend struct base::DefaultSingletonTraits<ClassRegistrar>;
|
|
|
| typedef std::list<RegisteredClass> RegisteredClasses;
|
| RegisteredClasses registered_classes_;
|
| @@ -98,8 +98,8 @@ ClassRegistrar::~ClassRegistrar() {}
|
|
|
| // static
|
| ClassRegistrar* ClassRegistrar::GetInstance() {
|
| - return Singleton<ClassRegistrar,
|
| - LeakySingletonTraits<ClassRegistrar> >::get();
|
| + return base::Singleton<ClassRegistrar,
|
| + base::LeakySingletonTraits<ClassRegistrar>>::get();
|
| }
|
|
|
| void ClassRegistrar::UnregisterClasses() {
|
|
|