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

Unified Diff: base/memory/weak_ptr.h

Issue 19882002: Revert 211956 "base: Change WeakPtr to use SequenceChecker inste..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Fix patch and rebase Created 7 years, 5 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
« no previous file with comments | « base/base.gyp ('k') | base/memory/weak_ptr.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/memory/weak_ptr.h
diff --git a/base/memory/weak_ptr.h b/base/memory/weak_ptr.h
index b4120a1140d109ff89f60e71a55e031e128220c9..621c0fae8872b48dff7bec6050004438558e3be0 100644
--- a/base/memory/weak_ptr.h
+++ b/base/memory/weak_ptr.h
@@ -67,8 +67,8 @@
#include "base/base_export.h"
#include "base/logging.h"
#include "base/memory/ref_counted.h"
-#include "base/sequence_checker.h"
#include "base/template_util.h"
+#include "base/threading/thread_checker.h"
namespace base {
@@ -91,14 +91,14 @@ class BASE_EXPORT WeakReference {
bool IsValid() const;
// Remove this when crbug.com/234964 is addressed.
- void DetachFromThreadHack() { sequence_checker_.DetachFromSequence(); }
+ void DetachFromThreadHack() { thread_checker_.DetachFromThread(); }
private:
friend class base::RefCountedThreadSafe<Flag>;
~Flag();
- SequenceChecker sequence_checker_;
+ ThreadChecker thread_checker_;
bool is_valid_;
};
« no previous file with comments | « base/base.gyp ('k') | base/memory/weak_ptr.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698