Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(97)

Unified Diff: base/memory/singleton_objc.h

Issue 6714032: Move some files in base to base/memory. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: only base Created 9 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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_

Powered by Google App Engine
This is Rietveld 408576698