summaryrefslogtreecommitdiffstats
path: root/base/message_loop_proxy_impl.cc
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2010-11-18 18:32:45 +0000
committerBen Murdoch <benm@google.com>2010-11-18 18:38:07 +0000
commit513209b27ff55e2841eac0e4120199c23acce758 (patch)
treeaeba30bb08c5f47c57003544e378a377c297eee6 /base/message_loop_proxy_impl.cc
parent164f7496de0fbee436b385a79ead9e3cb81a50c1 (diff)
downloadexternal_chromium-513209b27ff55e2841eac0e4120199c23acce758.zip
external_chromium-513209b27ff55e2841eac0e4120199c23acce758.tar.gz
external_chromium-513209b27ff55e2841eac0e4120199c23acce758.tar.bz2
Merge Chromium at r65505: Initial merge by git.
Change-Id: I31d8f1d8cd33caaf7f47ffa7350aef42d5fbdb45
Diffstat (limited to 'base/message_loop_proxy_impl.cc')
-rw-r--r--base/message_loop_proxy_impl.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/base/message_loop_proxy_impl.cc b/base/message_loop_proxy_impl.cc
index 983a406..2e0f809 100644
--- a/base/message_loop_proxy_impl.cc
+++ b/base/message_loop_proxy_impl.cc
@@ -71,7 +71,7 @@ bool MessageLoopProxyImpl::PostTaskHelper(
return ret;
}
-void MessageLoopProxyImpl::OnDestruct() {
+void MessageLoopProxyImpl::OnDestruct() const {
bool delete_later = false;
{
AutoLock lock(message_loop_lock_);
@@ -93,7 +93,7 @@ void MessageLoopProxyImpl::WillDestroyCurrentMessageLoop() {
scoped_refptr<MessageLoopProxy>
MessageLoopProxy::CreateForCurrentThread() {
- scoped_refptr<MessageLoopProxy> ret = new MessageLoopProxyImpl();
+ scoped_refptr<MessageLoopProxy> ret(new MessageLoopProxyImpl());
return ret;
}