Index: content/browser/message_port_service.h |
diff --git a/content/browser/message_port_service.h b/content/browser/message_port_service.h |
index b46a7fa36b1802e2a173081d5e4844de3560b083..e53846db7a5acf0e4a42bb7d2b73af0d83b26b11 100644 |
--- a/content/browser/message_port_service.h |
+++ b/content/browser/message_port_service.h |
@@ -13,7 +13,6 @@ |
#include "base/memory/singleton.h" |
#include "base/strings/string16.h" |
#include "content/common/content_export.h" |
-#include "content/public/common/message_port_types.h" |
#include "ipc/ipc_message.h" |
namespace content { |
@@ -21,8 +20,7 @@ class MessagePortDelegate; |
class CONTENT_EXPORT MessagePortService { |
public: |
- typedef std::vector<std::pair<content::MessagePortMessage, |
- std::vector<TransferredMessagePort>>> |
+ typedef std::vector<std::pair<base::string16, std::vector<int>>> |
QueuedMessages; |
// Returns the MessagePortService singleton. |
@@ -36,8 +34,8 @@ class CONTENT_EXPORT MessagePortService { |
void Entangle(int local_message_port_id, int remote_message_port_id); |
void PostMessage( |
int sender_message_port_id, |
- const MessagePortMessage& message, |
- const std::vector<TransferredMessagePort>& sent_message_ports); |
+ const base::string16& message, |
+ const std::vector<int>& sent_message_ports); |
void QueueMessages(int message_port_id); |
void SendQueuedMessages(int message_port_id, |
const QueuedMessages& queued_messages); |
@@ -86,8 +84,8 @@ class CONTENT_EXPORT MessagePortService { |
void PostMessageTo( |
int message_port_id, |
- const MessagePortMessage& message, |
- const std::vector<TransferredMessagePort>& sent_message_ports); |
+ const base::string16& message, |
+ const std::vector<int>& sent_message_ports); |
// Handles the details of removing a message port id. Before calling this, |
// verify that the message port id exists. |