Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(672)

Unified Diff: content/browser/devtools/devtools_agent_host_impl.h

Issue 1437283003: [DevTools] filter any messages from previous session in DevToolsAgentHostImpl (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/devtools/devtools_agent_host_impl.h
diff --git a/content/browser/devtools/devtools_agent_host_impl.h b/content/browser/devtools/devtools_agent_host_impl.h
index 8474c0a658f96114b9824d9eb461fb9807b04542..2dc09cc2d38a8a85af341dbcc4771284d18569ba 100644
--- a/content/browser/devtools/devtools_agent_host_impl.h
+++ b/content/browser/devtools/devtools_agent_host_impl.h
@@ -9,6 +9,7 @@
#include "base/compiler_specific.h"
#include "content/browser/devtools/devtools_io_context.h"
+#include "content/browser/devtools/protocol/devtools_protocol_delegate.h"
#include "content/common/content_export.h"
#include "content/common/devtools_messages.h"
#include "content/public/browser/devtools_agent_host.h"
@@ -22,7 +23,8 @@ namespace content {
class BrowserContext;
// Describes interface for managing devtools agents from the browser process.
-class CONTENT_EXPORT DevToolsAgentHostImpl : public DevToolsAgentHost {
+class CONTENT_EXPORT DevToolsAgentHostImpl : public DevToolsAgentHost,
+ public DevToolsProtocolDelegate {
public:
// Informs the hosted agent that a client host has attached.
virtual void Attach() = 0;
@@ -44,14 +46,21 @@ class CONTENT_EXPORT DevToolsAgentHostImpl : public DevToolsAgentHost {
void DisconnectWebContents() override;
void ConnectWebContents(WebContents* wc) override;
+ // DevToolsProtocolDelegate implementation.
+ void SendProtocolResponse(int session_id,
+ const std::string& message) override;
+ void SendProtocolNotification(const std::string& message) override;
+
protected:
DevToolsAgentHostImpl();
~DevToolsAgentHostImpl() override;
void HostClosed();
- void SendMessageToClient(const std::string& message);
+ void SendMessageToClient(int session_id, const std::string& message);
devtools::DevToolsIOContext* GetIOContext() { return &io_context_; }
+ int session_id() { DCHECK(client_); return session_id_; }
+
static void NotifyCallbacks(DevToolsAgentHostImpl* agent_host, bool attached);
private:
@@ -59,13 +68,14 @@ class CONTENT_EXPORT DevToolsAgentHostImpl : public DevToolsAgentHost {
void InnerDetach();
const std::string id_;
+ int session_id_;
DevToolsAgentHostClient* client_;
devtools::DevToolsIOContext io_context_;
};
class DevToolsMessageChunkProcessor {
public:
- using SendMessageCallback = base::Callback<void(const std::string&)>;
+ using SendMessageCallback = base::Callback<void(int, const std::string&)>;
explicit DevToolsMessageChunkProcessor(const SendMessageCallback& callback);
~DevToolsMessageChunkProcessor();
« no previous file with comments | « content/browser/devtools/browser_devtools_agent_host.cc ('k') | content/browser/devtools/devtools_agent_host_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698