Index: chrome/browser/extensions/api/messaging/native_message_process_host.h |
diff --git a/chrome/browser/extensions/api/messaging/native_message_process_host.h b/chrome/browser/extensions/api/messaging/native_message_process_host.h |
index d629b089220de77641eca3596ad40710e73c5564..0f2419a87000f7bdf17e0945ea9065eb3f818ce1 100644 |
--- a/chrome/browser/extensions/api/messaging/native_message_process_host.h |
+++ b/chrome/browser/extensions/api/messaging/native_message_process_host.h |
@@ -43,20 +43,6 @@ class NativeMessageProcessHost |
typedef base::Callback<void(ScopedHost host)> CreateCallback; |
- // Append any new types to the end. Changing the ordering will break native |
- // apps. |
- enum MessageType { |
- TYPE_SEND_MESSAGE_REQUEST, // Used when an extension is sending a one-off |
- // message to a native app. |
- TYPE_SEND_MESSAGE_RESPONSE, // Used by a native app to respond to a one-off |
- // message. |
- TYPE_CONNECT, // Used when an extension wants to establish a persistent |
- // connection with a native app. |
- TYPE_CONNECT_MESSAGE, // Used for messages after a connection has already |
- // been established. |
- NUM_MESSAGE_TYPES // The number of types of messages. |
- }; |
- |
// Interface for classes that which to recieve messages from the native |
// process. |
class Client { |
@@ -81,30 +67,22 @@ class NativeMessageProcessHost |
virtual ~NativeMessageProcessHost(); |
- // |type| must be TYPE_CONNECT or TYPE_SEND_MESSAGE_REQUEST. |callback| will |
- // be called with an empty ScopedHost on error. |
+ // |callback| will be called with an empty ScopedHost on error. |
static void Create(base::WeakPtr<Client> weak_client_ui, |
const std::string& native_app_name, |
- const std::string& connection_message, |
int destination_port, |
- MessageType type, |
CreateCallback callback); |
// Create a NativeMessageProcessHost using the specified launcher. This allows |
// for easy testing. |
static void CreateWithLauncher(base::WeakPtr<Client> weak_client_ui, |
const std::string& native_app_name, |
- const std::string& connection_message, |
int destination_port, |
- MessageType type, |
CreateCallback callback, |
const NativeProcessLauncher& launcher); |
- // TYPE_SEND_MESSAGE_REQUEST will be sent via the connection message in |
- // NativeMessageProcessHost::Create, so only TYPE_CONNECT_MESSAGE is expected. |
- void Send(const std::string& json) { |
- SendImpl(TYPE_CONNECT_MESSAGE, json); |
- } |
+ // Send a message with the specified payload. |
+ void Send(const std::string& json); |
// Try and read a single message from |read_file_|. This should only be called |
// in unittests when you know there is data in the file. |
@@ -115,21 +93,17 @@ class NativeMessageProcessHost |
int destination_port, |
base::ProcessHandle native_process_handle, |
FileHandle read_fd, |
- FileHandle write_fd, |
- bool is_send_message); |
+ FileHandle write_fd); |
// Initialize any IO watching that needs to occur between the native process. |
void InitIO(); |
- // Send a message to the native process with the specified type and payload. |
- void SendImpl(MessageType type, const std::string& json); |
- |
// Write a message/data to the native process. |
- bool WriteMessage(MessageType type, const std::string& message); |
+ bool WriteMessage(const std::string& message); |
bool WriteData(FileHandle file, const char* data, size_t bytes_to_write); |
// Read a message/data from the native process. |
- bool ReadMessage(MessageType* type, std::string* messgae); |
+ bool ReadMessage(std::string* message); |
bool ReadData(FileHandle file, char* data, size_t bytes_to_write); |
#if defined(OS_POSIX) |