diff options
| author | deanm@chromium.org <deanm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-25 22:46:59 +0000 |
|---|---|---|
| committer | deanm@chromium.org <deanm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-25 22:46:59 +0000 |
| commit | 95ab1553ce02175cf23278d80b8440b27740159c (patch) | |
| tree | 56fc9eb4c803368b24b191c108f143c8009eb03c /chrome/browser/jankometer.cc | |
| parent | d8375fdbe8d32ad3562152ecd53378383e393971 (diff) | |
| download | chromium_src-95ab1553ce02175cf23278d80b8440b27740159c.zip chromium_src-95ab1553ce02175cf23278d80b8440b27740159c.tar.gz chromium_src-95ab1553ce02175cf23278d80b8440b27740159c.tar.bz2 | |
Port base/watchdog to Linux.
BUG=4632
Review URL: http://codereview.chromium.org/11326
Patch from Pawel Hajdan Jr.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6004 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/jankometer.cc')
| -rw-r--r-- | chrome/browser/jankometer.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/jankometer.cc b/chrome/browser/jankometer.cc index 8ace428..e1b3016 100644 --- a/chrome/browser/jankometer.cc +++ b/chrome/browser/jankometer.cc @@ -54,7 +54,7 @@ class JankWatchdog : public Watchdog { JankWatchdog(const TimeDelta& duration, const std::string& thread_watched_name, bool enabled) - : Watchdog(duration, ASCIIToWide(thread_watched_name), enabled), + : Watchdog(duration, thread_watched_name, enabled), thread_name_watched_(thread_watched_name), alarm_count_(0) { } @@ -72,7 +72,7 @@ class JankWatchdog : public Watchdog { std::string thread_name_watched_; int alarm_count_; - DISALLOW_EVIL_CONSTRUCTORS(JankWatchdog); + DISALLOW_COPY_AND_ASSIGN(JankWatchdog); }; //------------------------------------------------------------------------------ |