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 /chrome/common/deprecated | |
| 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 'chrome/common/deprecated')
| -rw-r--r-- | chrome/common/deprecated/event_sys-inl.h | 2 | ||||
| -rw-r--r-- | chrome/common/deprecated/event_sys.h | 4 | ||||
| -rw-r--r-- | chrome/common/deprecated/event_sys_unittest.cc | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/chrome/common/deprecated/event_sys-inl.h b/chrome/common/deprecated/event_sys-inl.h index 62fa350..2699a58 100644 --- a/chrome/common/deprecated/event_sys-inl.h +++ b/chrome/common/deprecated/event_sys-inl.h @@ -4,10 +4,10 @@ #ifndef CHROME_COMMON_DEPRECATED_EVENT_SYS_INL_H_ #define CHROME_COMMON_DEPRECATED_EVENT_SYS_INL_H_ +#pragma once #include <map> -#include "base/atomicops.h" #include "base/basictypes.h" #include "base/condition_variable.h" #include "base/lock.h" diff --git a/chrome/common/deprecated/event_sys.h b/chrome/common/deprecated/event_sys.h index bec8144..6e34eb7 100644 --- a/chrome/common/deprecated/event_sys.h +++ b/chrome/common/deprecated/event_sys.h @@ -4,6 +4,7 @@ #ifndef CHROME_COMMON_DEPRECATED_EVENT_SYS_H_ #define CHROME_COMMON_DEPRECATED_EVENT_SYS_H_ +#pragma once // TODO: This class should be removed or moved to Notifier code. // See Bug 42450 (http://code.google.com/p/chromium/issues/detail?id=42450). @@ -19,6 +20,9 @@ template <typename EventType> class EventListener { public: virtual void HandleEvent(const EventType& event) = 0; + + protected: + virtual ~EventListener() {} }; // See the -inl.h for details about the following. diff --git a/chrome/common/deprecated/event_sys_unittest.cc b/chrome/common/deprecated/event_sys_unittest.cc index c70d3f7..2c55038 100644 --- a/chrome/common/deprecated/event_sys_unittest.cc +++ b/chrome/common/deprecated/event_sys_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2009 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. @@ -8,7 +8,6 @@ #include <vector> #include "base/basictypes.h" -#include "base/logging.h" #include "base/message_loop.h" #include "base/platform_thread.h" #include "base/port.h" |