summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-24 07:40:11 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-24 07:40:11 +0000
commitabac987398cdef01786a9acdc07c7aca5a6e8a58 (patch)
tree96a34e00f82b5674c2086a6cd06e953815272faa
parent52617df3c0d6b2f57763d52dd3c24dab32154d61 (diff)
downloadchromium_src-abac987398cdef01786a9acdc07c7aca5a6e8a58.zip
chromium_src-abac987398cdef01786a9acdc07c7aca5a6e8a58.tar.gz
chromium_src-abac987398cdef01786a9acdc07c7aca5a6e8a58.tar.bz2
Make a few more places use bool for OnMessageReceived.
TBR=brettw Review URL: http://codereview.chromium.org/6005006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70141 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/common/ipc_test_sink.cc3
-rw-r--r--chrome/common/ipc_test_sink.h2
-rw-r--r--chrome/test/automation/tab_proxy.h2
-rw-r--r--chrome_frame/chrome_frame_automation.cc7
-rw-r--r--chrome_frame/chrome_frame_automation.h4
5 files changed, 10 insertions, 8 deletions
diff --git a/chrome/common/ipc_test_sink.cc b/chrome/common/ipc_test_sink.cc
index 45db8f5..69d328c 100644
--- a/chrome/common/ipc_test_sink.cc
+++ b/chrome/common/ipc_test_sink.cc
@@ -19,8 +19,9 @@ bool TestSink::Send(IPC::Message* message) {
return true;
}
-void TestSink::OnMessageReceived(const Message& msg) {
+bool TestSink::OnMessageReceived(const Message& msg) {
messages_.push_back(Message(msg));
+ return true;
}
void TestSink::ClearMessages() {
diff --git a/chrome/common/ipc_test_sink.h b/chrome/common/ipc_test_sink.h
index caf6276..05720d4 100644
--- a/chrome/common/ipc_test_sink.h
+++ b/chrome/common/ipc_test_sink.h
@@ -54,7 +54,7 @@ class TestSink : public IPC::Channel {
// Used by the source of the messages to send the message to the sink. This
// will make a copy of the message and store it in the list.
- void OnMessageReceived(const Message& msg);
+ bool OnMessageReceived(const Message& msg);
// Returns the number of messages in the queue.
size_t message_count() const { return messages_.size(); }
diff --git a/chrome/test/automation/tab_proxy.h b/chrome/test/automation/tab_proxy.h
index 82f65ac..7c02805 100644
--- a/chrome/test/automation/tab_proxy.h
+++ b/chrome/test/automation/tab_proxy.h
@@ -48,7 +48,7 @@ class TabProxy : public AutomationResourceProxy,
public:
class TabProxyDelegate {
public:
- virtual void OnMessageReceived(TabProxy* tab, const IPC::Message& msg) {}
+ virtual bool OnMessageReceived(TabProxy* tab, const IPC::Message& msg) {}
virtual void OnChannelError(TabProxy* tab) {}
protected:
diff --git a/chrome_frame/chrome_frame_automation.cc b/chrome_frame/chrome_frame_automation.cc
index a026669..887e545 100644
--- a/chrome_frame/chrome_frame_automation.cc
+++ b/chrome_frame/chrome_frame_automation.cc
@@ -1168,19 +1168,20 @@ bool ChromeFrameAutomationClient::ProcessUrlRequestMessage(TabProxy* tab,
// kind of beings.
// By default we marshal the IPC message to the main/GUI thread and from there
// we safely invoke chrome_frame_delegate_->OnMessageReceived(msg).
-void ChromeFrameAutomationClient::OnMessageReceived(TabProxy* tab,
+bool ChromeFrameAutomationClient::OnMessageReceived(TabProxy* tab,
const IPC::Message& msg) {
DCHECK(tab == tab_.get());
// Quickly process network related messages.
if (url_fetcher_ && ProcessUrlRequestMessage(tab, msg, false))
- return;
+ return true;
// Early check to avoid needless marshaling
if (chrome_frame_delegate_ == NULL)
- return;
+ return false;
PostTask(FROM_HERE, NewRunnableMethod(this,
&ChromeFrameAutomationClient::OnMessageReceivedUIThread, msg));
+ return true;
}
void ChromeFrameAutomationClient::OnChannelError(TabProxy* tab) {
diff --git a/chrome_frame/chrome_frame_automation.h b/chrome_frame/chrome_frame_automation.h
index 7432ee2..b4dbea2 100644
--- a/chrome_frame/chrome_frame_automation.h
+++ b/chrome_frame/chrome_frame_automation.h
@@ -459,7 +459,7 @@ class ChromeFrameAutomationClient
virtual void AutomationServerDied();
// TabProxyDelegate implementation
- virtual void OnMessageReceived(TabProxy* tab, const IPC::Message& msg);
+ virtual bool OnMessageReceived(TabProxy* tab, const IPC::Message& msg);
virtual void OnChannelError(TabProxy* tab);
void CreateExternalTab();
@@ -480,7 +480,7 @@ class ChromeFrameAutomationClient
}
private:
- void OnMessageReceivedUIThread(const IPC::Message& msg);
+ bool OnMessageReceivedUIThread(const IPC::Message& msg);
void OnChannelErrorUIThread();
HWND chrome_window() const { return chrome_window_; }