Index: android_webview/browser/aw_message_port_message_filter.cc |
diff --git a/android_webview/browser/aw_message_port_message_filter.cc b/android_webview/browser/aw_message_port_message_filter.cc |
index 74b1aa5ffb9e45936e9faa12b34d28a1975bd6e2..60b143ed5c1659a5d14a402506ceb3e6302f79d2 100644 |
--- a/android_webview/browser/aw_message_port_message_filter.cc |
+++ b/android_webview/browser/aw_message_port_message_filter.cc |
@@ -30,26 +30,46 @@ bool AwMessagePortMessageFilter::OnMessageReceived( |
const IPC::Message& message) { |
bool handled = true; |
IPC_BEGIN_MESSAGE_MAP(AwMessagePortMessageFilter, message) |
- IPC_MESSAGE_FORWARD(AwMessagePortHostMsg_ConvertedMessage, |
+ IPC_MESSAGE_FORWARD(AwMessagePortHostMsg_ConvertedWebToAppMessage, |
AwBrowserContext::GetDefault()->GetMessagePortService(), |
- AwMessagePortService::OnConvertedMessage) |
+ AwMessagePortService::OnConvertedWebToAppMessage) |
+ IPC_MESSAGE_HANDLER(AwMessagePortHostMsg_ConvertedAppToWebMessage, |
+ OnConvertedAppToWebMessage) |
IPC_MESSAGE_UNHANDLED(handled = false) |
IPC_END_MESSAGE_MAP() |
return handled; |
} |
+void AwMessagePortMessageFilter::OnConvertedAppToWebMessage( |
+ int msg_port_id, |
+ const base::string16& message, |
+ const std::vector<int>& sent_message_port_ids) { |
+ MessagePortProvider::PostMessageToPort(msg_port_id, message, |
+ sent_message_port_ids); |
+} |
+ |
void AwMessagePortMessageFilter::OnDestruct() const { |
BrowserThread::DeleteOnIOThread::Destruct(this); |
} |
+void AwMessagePortMessageFilter::SendAppToWebMessage( |
+ int msg_port_route_id, |
+ const base::string16& message, |
+ const std::vector<int>& sent_message_port_ids) { |
+ Send(new AwMessagePortMsg_AppToWebMessage( |
+ route_id_, |
+ msg_port_route_id, // same as the port id |
+ message, sent_message_port_ids)); |
+} |
+ |
void AwMessagePortMessageFilter::SendMessage( |
int msg_port_route_id, |
const base::string16& message, |
const std::vector<int>& sent_message_port_ids) { |
- Send(new AwMessagePortMsg_Message(route_id_, |
- msg_port_route_id, // same as the port id |
- message, |
- sent_message_port_ids)); |
+ Send(new AwMessagePortMsg_WebToAppMessage( |
+ route_id_, |
+ msg_port_route_id, // same as the port id |
+ message, sent_message_port_ids)); |
} |
void AwMessagePortMessageFilter::SendMessagesAreQueued(int route_id) { |