summaryrefslogtreecommitdiffstats
path: root/chrome_frame
diff options
context:
space:
mode:
authorgfeher@chromium.org <gfeher@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-24 08:16:46 +0000
committergfeher@chromium.org <gfeher@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-24 08:16:46 +0000
commit2c9847a108f297b51f1c9823d092d7959f80bf3f (patch)
treef330022dd3362d6c96fd51c2c4b73dc616e32ba2 /chrome_frame
parent8ebaa1e52bcad26bbeb32af1e12ab54927a0d986 (diff)
downloadchromium_src-2c9847a108f297b51f1c9823d092d7959f80bf3f.zip
chromium_src-2c9847a108f297b51f1c9823d092d7959f80bf3f.tar.gz
chromium_src-2c9847a108f297b51f1c9823d092d7959f80bf3f.tar.bz2
Revert 70141 - Make a few more places use bool for OnMessageReceived.
TBR=brettw Review URL: http://codereview.chromium.org/6005006 TBR=jam@chromium.org Review URL: http://codereview.chromium.org/6094002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70145 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
-rw-r--r--chrome_frame/chrome_frame_automation.cc7
-rw-r--r--chrome_frame/chrome_frame_automation.h4
2 files changed, 5 insertions, 6 deletions
diff --git a/chrome_frame/chrome_frame_automation.cc b/chrome_frame/chrome_frame_automation.cc
index 887e545..a026669 100644
--- a/chrome_frame/chrome_frame_automation.cc
+++ b/chrome_frame/chrome_frame_automation.cc
@@ -1168,20 +1168,19 @@ 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).
-bool ChromeFrameAutomationClient::OnMessageReceived(TabProxy* tab,
+void 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 true;
+ return;
// Early check to avoid needless marshaling
if (chrome_frame_delegate_ == NULL)
- return false;
+ return;
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 b4dbea2..7432ee2 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 bool OnMessageReceived(TabProxy* tab, const IPC::Message& msg);
+ virtual void OnMessageReceived(TabProxy* tab, const IPC::Message& msg);
virtual void OnChannelError(TabProxy* tab);
void CreateExternalTab();
@@ -480,7 +480,7 @@ class ChromeFrameAutomationClient
}
private:
- bool OnMessageReceivedUIThread(const IPC::Message& msg);
+ void OnMessageReceivedUIThread(const IPC::Message& msg);
void OnChannelErrorUIThread();
HWND chrome_window() const { return chrome_window_; }