| Index: base/memory/singleton_objc.h
|
| diff --git a/base/singleton_objc.h b/base/memory/singleton_objc.h
|
| similarity index 93%
|
| rename from base/singleton_objc.h
|
| rename to base/memory/singleton_objc.h
|
| index e28c8a56df7625b8a8234ec6f28796e9a08396d5..97ed96c28e7d4b1b78a1b1c268e6734aa42fb8e5 100644
|
| --- a/base/singleton_objc.h
|
| +++ b/base/memory/singleton_objc.h
|
| @@ -27,12 +27,12 @@
|
| // ...
|
| // Foo* widgetSingleton = SingletonObjC<Foo, FooSingletonTraits>::get();
|
|
|
| -#ifndef BASE_SINGLETON_OBJC_H_
|
| -#define BASE_SINGLETON_OBJC_H_
|
| +#ifndef BASE_MEMORY_SINGLETON_OBJC_H_
|
| +#define BASE_MEMORY_SINGLETON_OBJC_H_
|
| #pragma once
|
|
|
| #import <Foundation/Foundation.h>
|
| -#include "base/singleton.h"
|
| +#include "base/memory/singleton.h"
|
|
|
| // Singleton traits usable to manage traditional Objective-C objects, which
|
| // are instantiated by sending |alloc| and |init| messages, and are deallocated
|
| @@ -58,4 +58,4 @@ template<typename Type,
|
| class SingletonObjC : public Singleton<Type, Traits, DifferentiatingType> {
|
| };
|
|
|
| -#endif // BASE_SINGLETON_OBJC_H_
|
| +#endif // BASE_MEMORY_SINGLETON_OBJC_H_
|
|
|