summaryrefslogtreecommitdiffstats
path: root/base/non_thread_safe.cc
diff options
context:
space:
mode:
authorIain Merrick <husky@google.com>2010-11-01 12:19:54 +0000
committerIain Merrick <husky@google.com>2010-11-03 10:21:10 +0000
commit731df977c0511bca2206b5f333555b1205ff1f43 (patch)
tree0e750b949b3f00a1ac11fda25d3c2de512f2b465 /base/non_thread_safe.cc
parent5add15e10e7bb80512f2c597ca57221314abe577 (diff)
downloadexternal_chromium-731df977c0511bca2206b5f333555b1205ff1f43.zip
external_chromium-731df977c0511bca2206b5f333555b1205ff1f43.tar.gz
external_chromium-731df977c0511bca2206b5f333555b1205ff1f43.tar.bz2
Merge Chromium at r63472 : Initial merge by git.
Change-Id: Ifb9ee821af006a5f2211e81471be93ae440a1f5a
Diffstat (limited to 'base/non_thread_safe.cc')
-rw-r--r--base/non_thread_safe.cc8
1 files changed, 6 insertions, 2 deletions
diff --git a/base/non_thread_safe.cc b/base/non_thread_safe.cc
index 6889101..b01ed55 100644
--- a/base/non_thread_safe.cc
+++ b/base/non_thread_safe.cc
@@ -9,12 +9,16 @@
#include "base/logging.h"
+NonThreadSafe::~NonThreadSafe() {
+ DCHECK(CalledOnValidThread());
+}
+
bool NonThreadSafe::CalledOnValidThread() const {
return thread_checker_.CalledOnValidThread();
}
-NonThreadSafe::~NonThreadSafe() {
- DCHECK(CalledOnValidThread());
+void NonThreadSafe::DetachFromThread() {
+ thread_checker_.DetachFromThread();
}
#endif // NDEBUG