diff options
| author | Ben Murdoch <benm@google.com> | 2010-07-29 17:14:53 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-08-04 14:29:45 +0100 |
| commit | c407dc5cd9bdc5668497f21b26b09d988ab439de (patch) | |
| tree | 7eaf8707c0309516bdb042ad976feedaf72b0bb1 /base/event_recorder.h | |
| parent | 0998b1cdac5733f299c12d88bc31ef9c8035b8fa (diff) | |
| download | external_chromium-c407dc5cd9bdc5668497f21b26b09d988ab439de.zip external_chromium-c407dc5cd9bdc5668497f21b26b09d988ab439de.tar.gz external_chromium-c407dc5cd9bdc5668497f21b26b09d988ab439de.tar.bz2 | |
Merge Chromium src@r53293
Change-Id: Ia79acf8670f385cee48c45b0a75371d8e950af34
Diffstat (limited to 'base/event_recorder.h')
| -rw-r--r-- | base/event_recorder.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/base/event_recorder.h b/base/event_recorder.h index 29ed350..df99428 100644 --- a/base/event_recorder.h +++ b/base/event_recorder.h @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -94,7 +94,7 @@ class EventRecorder { int playback_first_msg_time_; int playback_start_time_; - DISALLOW_EVIL_CONSTRUCTORS(EventRecorder); + DISALLOW_COPY_AND_ASSIGN(EventRecorder); }; } // namespace base |