diff options
author | hamaji@chromium.org <hamaji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-09 05:10:48 +0000 |
---|---|---|
committer | hamaji@chromium.org <hamaji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-09 05:10:48 +0000 |
commit | 94128148b2ba757e212ae34007d44f3912a2f3d2 (patch) | |
tree | 9d4310495e83a4ba568daf1cffcf580ebea1c76b /base/tracked.h | |
parent | 913cedfc4c6b3024e983528f7078fba7de61cb1a (diff) | |
download | chromium_src-94128148b2ba757e212ae34007d44f3912a2f3d2.zip chromium_src-94128148b2ba757e212ae34007d44f3912a2f3d2.tar.gz chromium_src-94128148b2ba757e212ae34007d44f3912a2f3d2.tar.bz2 |
Rebaseline tests whose expectations were changed by r55714.
The patch removed extra paddings inside buttons.
http://trac.webkit.org/changeset/55714
BUG=1437
TEST=none
Review URL: http://codereview.chromium.org/789003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49225 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/tracked.h')
-rw-r--r-- | base/tracked.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/base/tracked.h b/base/tracked.h index 3622d1c..b0be729 100644 --- a/base/tracked.h +++ b/base/tracked.h @@ -107,14 +107,8 @@ class Tracked { bool MissingBirthplace() const; -#if defined(TRACK_ALL_TASK_OBJECTS) - base::TimeTicks tracked_birth_time() const { return tracked_birth_time_; } -#else - base::TimeTicks tracked_birth_time() const { return base::TimeTicks::Now(); } -#endif // defined(TRACK_ALL_TASK_OBJECTS) - private: -#if defined(TRACK_ALL_TASK_OBJECTS) +#ifdef TRACK_ALL_TASK_OBJECTS // Pointer to instance were counts of objects with the same birth location // (on the same thread) are stored. @@ -124,7 +118,7 @@ class Tracked { // reset before the object begins it active life. base::TimeTicks tracked_birth_time_; -#endif // defined(TRACK_ALL_TASK_OBJECTS) +#endif // TRACK_ALL_TASK_OBJECTS DISALLOW_COPY_AND_ASSIGN(Tracked); }; |