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

Unified Diff: base/memory/weak_ptr.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/weak_ptr.h
diff --git a/base/weak_ptr.h b/base/memory/weak_ptr.h
similarity index 98%
rename from base/weak_ptr.h
rename to base/memory/weak_ptr.h
index 60da03fa6e20a9c55a3406bece22c686cc83d797..5680966c0da60f49fb7ebc0e874b05261571fdf5 100644
--- a/base/weak_ptr.h
+++ b/base/memory/weak_ptr.h
@@ -48,12 +48,12 @@
// WARNING: weak pointers are not threadsafe!!! You must only use a WeakPtr
// instance on thread where it was created.
-#ifndef BASE_WEAK_PTR_H_
-#define BASE_WEAK_PTR_H_
+#ifndef BASE_MEMORY_WEAK_PTR_H_
+#define BASE_MEMORY_WEAK_PTR_H_
#pragma once
#include "base/logging.h"
-#include "base/ref_counted.h"
+#include "base/memory/ref_counted.h"
#include "base/threading/non_thread_safe.h"
namespace base {
@@ -242,4 +242,4 @@ class WeakPtrFactory {
} // namespace base
-#endif // BASE_WEAK_PTR_H_
+#endif // BASE_MEMORY_WEAK_PTR_H_

Powered by Google App Engine
This is Rietveld 408576698