diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-16 21:29:33 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-16 21:29:33 +0000 |
| commit | e44d13473dd9d81a8d3e1d26f2024be4e4a7c503 (patch) | |
| tree | 4a66307f49ed83f6de7faba305cd6355a649b355 /android_webview | |
| parent | 51f81dae305d1bdfda139b18be3632f8fbf4959f (diff) | |
| download | chromium_src-e44d13473dd9d81a8d3e1d26f2024be4e4a7c503.zip chromium_src-e44d13473dd9d81a8d3e1d26f2024be4e4a7c503.tar.gz chromium_src-e44d13473dd9d81a8d3e1d26f2024be4e4a7c503.tar.bz2 | |
Remove IPC_BEGIN_MESSAGE_MAP_EX macro since r270839 made all bad IPCs kill their child processes.
R=avi@chromium.org
Review URL: https://codereview.chromium.org/292443004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@271096 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview')
| -rw-r--r-- | android_webview/browser/aw_content_browser_client.cc | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/android_webview/browser/aw_content_browser_client.cc b/android_webview/browser/aw_content_browser_client.cc index 1ba73c7..be21678 100644 --- a/android_webview/browser/aw_content_browser_client.cc +++ b/android_webview/browser/aw_content_browser_client.cc @@ -52,8 +52,7 @@ public: const IPC::Message& message, BrowserThread::ID* thread) OVERRIDE; virtual bool OnMessageReceived( - const IPC::Message& message, - bool* message_was_ok) OVERRIDE; + const IPC::Message& message) OVERRIDE; void OnShouldOverrideUrlLoading(int routing_id, const base::string16& url, @@ -83,14 +82,13 @@ void AwContentsMessageFilter::OverrideThreadForMessage( } } -bool AwContentsMessageFilter::OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) { +bool AwContentsMessageFilter::OnMessageReceived(const IPC::Message& message) { bool handled = true; - IPC_BEGIN_MESSAGE_MAP_EX(AwContentsMessageFilter, message, *message_was_ok) - IPC_MESSAGE_HANDLER(AwViewHostMsg_ShouldOverrideUrlLoading, - OnShouldOverrideUrlLoading) - IPC_MESSAGE_HANDLER(AwViewHostMsg_SubFrameCreated, OnSubFrameCreated) - IPC_MESSAGE_UNHANDLED(handled = false) + IPC_BEGIN_MESSAGE_MAP(AwContentsMessageFilter, message) + IPC_MESSAGE_HANDLER(AwViewHostMsg_ShouldOverrideUrlLoading, + OnShouldOverrideUrlLoading) + IPC_MESSAGE_HANDLER(AwViewHostMsg_SubFrameCreated, OnSubFrameCreated) + IPC_MESSAGE_UNHANDLED(handled = false) IPC_END_MESSAGE_MAP() return handled; } |