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/message_loop_proxy.h | |
| 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/message_loop_proxy.h')
| -rw-r--r-- | base/message_loop_proxy.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/base/message_loop_proxy.h b/base/message_loop_proxy.h index 10d5368..20e9e10 100644 --- a/base/message_loop_proxy.h +++ b/base/message_loop_proxy.h @@ -4,6 +4,7 @@ #ifndef BASE_MESSAGE_LOOP_PROXY_H_ #define BASE_MESSAGE_LOOP_PROXY_H_ +#pragma once #include "base/basictypes.h" #include "base/ref_counted.h" @@ -56,13 +57,12 @@ class MessageLoopProxy protected: friend struct MessageLoopProxyTraits; - virtual ~MessageLoopProxy() { } + MessageLoopProxy(); + virtual ~MessageLoopProxy(); // Called when the proxy is about to be deleted. Subclasses can override this // to provide deletion on specific threads. - virtual void OnDestruct() { - delete this; - } + virtual void OnDestruct(); }; struct MessageLoopProxyTraits { |