| Index: content/browser/devtools/protocol/devtools_protocol_client.h
|
| diff --git a/content/browser/devtools/protocol/devtools_protocol_client.h b/content/browser/devtools/protocol/devtools_protocol_client.h
|
| index 9297187f21c1778752372a2881912ab4c1bbe380..c0436af5d73a16916cb206600e8f470ba6858221 100644
|
| --- a/content/browser/devtools/protocol/devtools_protocol_client.h
|
| +++ b/content/browser/devtools/protocol/devtools_protocol_client.h
|
| @@ -16,7 +16,7 @@ class DevToolsProtocolDispatcher;
|
|
|
| class DevToolsProtocolClient {
|
| public:
|
| - typedef base::Callback<void(const std::string& message)>
|
| + typedef base::Callback<void(int, const std::string& message)>
|
| RawMessageCallback;
|
| static const DevToolsCommandId kNoId;
|
|
|
| @@ -43,19 +43,21 @@ class DevToolsProtocolClient {
|
| std::string message_;
|
| };
|
|
|
| - bool SendError(DevToolsCommandId command_id,
|
| + bool SendError(int session_id,
|
| + DevToolsCommandId command_id,
|
| const Response& response);
|
|
|
| // Sends message to client, the caller is presumed to properly
|
| // format the message. Do not use unless you must.
|
| - void SendRawMessage(const std::string& message);
|
| + void SendRawMessage(int session_id, const std::string& message);
|
|
|
| explicit DevToolsProtocolClient(
|
| const RawMessageCallback& raw_message_callback);
|
| virtual ~DevToolsProtocolClient();
|
|
|
| protected:
|
| - void SendSuccess(DevToolsCommandId command_id,
|
| + void SendSuccess(int session_id,
|
| + DevToolsCommandId command_id,
|
| scoped_ptr<base::DictionaryValue> params);
|
| void SendNotification(const std::string& method,
|
| scoped_ptr<base::DictionaryValue> params);
|
| @@ -63,7 +65,7 @@ class DevToolsProtocolClient {
|
| private:
|
| friend class DevToolsProtocolDispatcher;
|
|
|
| - void SendMessage(const base::DictionaryValue& message);
|
| + void SendMessage(int session_id, const base::DictionaryValue& message);
|
|
|
| RawMessageCallback raw_message_callback_;
|
| DISALLOW_COPY_AND_ASSIGN(DevToolsProtocolClient);
|
|
|