summaryrefslogtreecommitdiffstats
path: root/ipc/ipc_channel_nacl.cc
diff options
context:
space:
mode:
authordmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-06 18:14:56 +0000
committerdmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-06 18:14:56 +0000
commit5ce038b5bfb39d4f9e8bcfc11f772d1be722a75d (patch)
tree8805abbca03f7e3aa5db3ad2e30b8a47347d8fe3 /ipc/ipc_channel_nacl.cc
parentdc440cac1b3bd07a03272678a2be4c931d7d1957 (diff)
downloadchromium_src-5ce038b5bfb39d4f9e8bcfc11f772d1be722a75d.zip
chromium_src-5ce038b5bfb39d4f9e8bcfc11f772d1be722a75d.tar.gz
chromium_src-5ce038b5bfb39d4f9e8bcfc11f772d1be722a75d.tar.bz2
PPAPI/NaCl: Minor fixes to ipc_channel_nacl
1) Make ReaderThreadRunner keep a reference to the main message loop proxy (this probably doesn't matter in practice). 2) Add missing return statement to ChannelImpl::Connect. R=bbudge BUG=116317 TEST= Review URL: https://chromiumcodereview.appspot.com/10534024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140791 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ipc/ipc_channel_nacl.cc')
-rw-r--r--ipc/ipc_channel_nacl.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/ipc/ipc_channel_nacl.cc b/ipc/ipc_channel_nacl.cc
index 192b4a8b..88c695f 100644
--- a/ipc/ipc_channel_nacl.cc
+++ b/ipc/ipc_channel_nacl.cc
@@ -78,7 +78,7 @@ class Channel::ChannelImpl::ReaderThreadRunner
int pipe_;
base::Callback<void (scoped_ptr<std::vector<char> >)> data_read_callback_;
base::Callback<void ()> failure_callback_;
- base::MessageLoopProxy* main_message_loop_;
+ scoped_refptr<base::MessageLoopProxy> main_message_loop_;
DISALLOW_COPY_AND_ASSIGN(ReaderThreadRunner);
};
@@ -151,6 +151,7 @@ bool Channel::ChannelImpl::Connect() {
waiting_connect_ = false;
// If there were any messages queued before connection, send them.
ProcessOutgoingMessages();
+ return true;
}
void Channel::ChannelImpl::Close() {