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

Unified Diff: content/shell/browser/shell_devtools_frontend.h

Issue 427143003: [DevTools] Move DevToolsClientHost functionality out of DevToolsFrontendHost. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed comments Created 6 years, 5 months 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/shell/browser/shell_devtools_frontend.h
diff --git a/content/shell/browser/shell_devtools_frontend.h b/content/shell/browser/shell_devtools_frontend.h
index f08aa242b21fc631ab339480e7a50ae401a8d3ac..381ff22a126ce659ec47d91cef77fa112380b952 100644
--- a/content/shell/browser/shell_devtools_frontend.h
+++ b/content/shell/browser/shell_devtools_frontend.h
@@ -11,7 +11,7 @@
#include "base/memory/scoped_ptr.h"
#include "content/public/browser/devtools_agent_host.h"
#include "content/public/browser/devtools_client_host.h"
-#include "content/public/browser/devtools_frontend_host_delegate.h"
+#include "content/public/browser/devtools_frontend_host.h"
#include "content/public/browser/web_contents_observer.h"
namespace content {
@@ -24,7 +24,8 @@ class Shell;
class WebContents;
class ShellDevToolsFrontend : public WebContentsObserver,
- public DevToolsFrontendHostDelegate {
+ public DevToolsFrontendHost::Delegate,
+ public DevToolsClientHost {
public:
static ShellDevToolsFrontend* Show(WebContents* inspected_contents);
static ShellDevToolsFrontend* Show(WebContents* inspected_contents,
@@ -47,14 +48,20 @@ class ShellDevToolsFrontend : public WebContentsObserver,
virtual void WebContentsDestroyed() OVERRIDE;
virtual void RenderProcessGone(base::TerminationStatus status) OVERRIDE;
- // DevToolsFrontendHostDelegate implementation
- virtual void DispatchOnEmbedder(const std::string& message) OVERRIDE {}
+ // content::DevToolsFrontendHost::Delegate implementation.
+ virtual void HandleMessageFromDevToolsFrontend(
+ const std::string& message) OVERRIDE {}
+ virtual void HandleMessageFromDevToolsFrontendToBackend(
+ const std::string& message) OVERRIDE;
+ // content::DevToolsClientHost implementation.
+ virtual void DispatchOnInspectorFrontend(const std::string& message) OVERRIDE;
virtual void InspectedContentsClosing() OVERRIDE;
+ virtual void ReplacedWithAnotherClient() OVERRIDE {}
Shell* frontend_shell_;
scoped_refptr<DevToolsAgentHost> agent_host_;
- scoped_ptr<DevToolsClientHost> frontend_host_;
+ scoped_ptr<DevToolsFrontendHost> frontend_host_;
DISALLOW_COPY_AND_ASSIGN(ShellDevToolsFrontend);
};

Powered by Google App Engine
This is Rietveld 408576698