diff options
| author | kmadhusu@chromium.org <kmadhusu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-16 01:56:35 +0000 |
|---|---|---|
| committer | kmadhusu@chromium.org <kmadhusu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-16 01:56:35 +0000 |
| commit | 9f66d3066829486700ed7ac72328defcd2196ff3 (patch) | |
| tree | eb836489bb6e29d77fdffc258b1a8039e257868f /chrome/browser/metrics/thread_watcher.h | |
| parent | 6f7e5bc02b5edc14761ad17fd5abd4e97e9d1553 (diff) | |
| download | chromium_src-9f66d3066829486700ed7ac72328defcd2196ff3.zip chromium_src-9f66d3066829486700ed7ac72328defcd2196ff3.tar.gz chromium_src-9f66d3066829486700ed7ac72328defcd2196ff3.tar.bz2 | |
Revert 110235 - chrome: Remove 14 exit time destructors and 2 static initializers.
BUG=101600, 94925
TEST=none
TBR=mnissler
Review URL: http://codereview.chromium.org/8573021
TBR=thakis@chromium.org
Review URL: http://codereview.chromium.org/8568039
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110238 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/metrics/thread_watcher.h')
| -rw-r--r-- | chrome/browser/metrics/thread_watcher.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/chrome/browser/metrics/thread_watcher.h b/chrome/browser/metrics/thread_watcher.h index 64d9058..a36cbac 100644 --- a/chrome/browser/metrics/thread_watcher.h +++ b/chrome/browser/metrics/thread_watcher.h @@ -462,7 +462,7 @@ class WatchDogThread : public base::Thread { virtual ~WatchDogThread(); // Callable on any thread. Returns whether you're currently on a - // WatchDogThread. + // watchdog_thread_. static bool CurrentlyOnWatchDogThread(); // These are the same methods in message_loop.h, but are guaranteed to either @@ -486,6 +486,11 @@ class WatchDogThread : public base::Thread { const base::Closure& task, int64 delay_ms); + // This lock protects watchdog_thread_. + static base::Lock lock_; + + static WatchDogThread* watchdog_thread_; // The singleton of this class. + DISALLOW_COPY_AND_ASSIGN(WatchDogThread); }; |