diff options
| author | Iain Merrick <husky@google.com> | 2010-10-19 14:37:37 +0100 |
|---|---|---|
| committer | Iain Merrick <husky@google.com> | 2010-10-19 14:37:37 +0100 |
| commit | 3345a6884c488ff3a535c2c9acdd33d74b37e311 (patch) | |
| tree | 7784b988ef1698cb6967ea1bdf07616237716c6c /base/watchdog.cc | |
| parent | efc8475837ec58186051f23bb03542620424f6ce (diff) | |
| download | external_chromium-3345a6884c488ff3a535c2c9acdd33d74b37e311.zip external_chromium-3345a6884c488ff3a535c2c9acdd33d74b37e311.tar.gz external_chromium-3345a6884c488ff3a535c2c9acdd33d74b37e311.tar.bz2 | |
Merge Chromium at 7.0.540.0 : Initial merge by git
Not including third_party/icu as it contains huge data files that break Gerrit, and aren't actually used.
Change-Id: I428a386e70f3b58cacd28677b8cfda282e891e15
Diffstat (limited to 'base/watchdog.cc')
| -rw-r--r-- | base/watchdog.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/base/watchdog.cc b/base/watchdog.cc index d78ec0c..b20d9fa 100644 --- a/base/watchdog.cc +++ b/base/watchdog.cc @@ -5,6 +5,7 @@ #include "base/watchdog.h" #include "base/compiler_specific.h" +#include "base/logging.h" #include "base/platform_thread.h" using base::TimeDelta; @@ -72,6 +73,10 @@ void Watchdog::Disarm() { // will check its state and time, and act accordingly. } +void Watchdog::Alarm() { + DLOG(INFO) << "Watchdog alarmed for " << thread_watched_name_; +} + //------------------------------------------------------------------------------ // Internal private methods that the watchdog thread uses. |