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

Unified Diff: chrome/browser/metrics/thread_watcher.h

Issue 8568039: Revert 110235 - chrome: Remove 14 exit time destructors and 2 static initializers. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 1 month 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 | « chrome/browser/google/google_update_settings_posix.cc ('k') | chrome/browser/metrics/thread_watcher.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/metrics/thread_watcher.h
===================================================================
--- chrome/browser/metrics/thread_watcher.h (revision 110237)
+++ chrome/browser/metrics/thread_watcher.h (working copy)
@@ -462,7 +462,7 @@
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 @@
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);
};
« no previous file with comments | « chrome/browser/google/google_update_settings_posix.cc ('k') | chrome/browser/metrics/thread_watcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698