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

Unified Diff: chrome/browser/devtools/devtools_ui_bindings.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: chrome/browser/devtools/devtools_ui_bindings.h
diff --git a/chrome/browser/devtools/devtools_ui_bindings.h b/chrome/browser/devtools/devtools_ui_bindings.h
index 8ebd805f378f6c9644711fed1401512b666de4c9..2ec6de585c59e3030dd2dc8164ef9e0a1ef15f27 100644
--- a/chrome/browser/devtools/devtools_ui_bindings.h
+++ b/chrome/browser/devtools/devtools_ui_bindings.h
@@ -18,7 +18,7 @@
#include "chrome/browser/devtools/devtools_file_system_indexer.h"
#include "chrome/browser/devtools/devtools_targets_ui.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/notification_observer.h"
#include "content/public/browser/notification_registrar.h"
#include "ui/gfx/size.h"
@@ -34,9 +34,10 @@ class WebContents;
// Base implementation of DevTools bindings around front-end.
class DevToolsUIBindings : public content::NotificationObserver,
- public content::DevToolsFrontendHostDelegate,
+ public content::DevToolsFrontendHost::Delegate,
public DevToolsEmbedderMessageDispatcher::Delegate,
- public DevToolsAndroidBridge::DeviceCountListener {
+ public DevToolsAndroidBridge::DeviceCountListener,
+ public content::DevToolsClientHost {
public:
static GURL ApplyThemeToURL(Profile* profile, const GURL& base_url);
@@ -65,7 +66,6 @@ class DevToolsUIBindings : public content::NotificationObserver,
content::WebContents* web_contents() { return web_contents_; }
Profile* profile() { return profile_; }
- content::DevToolsClientHost* frontend_host() { return frontend_host_.get(); }
// Takes ownership over the |delegate|.
void SetDelegate(Delegate* delegate);
@@ -74,16 +74,23 @@ class DevToolsUIBindings : public content::NotificationObserver,
const base::Value* arg2,
const base::Value* arg3);
private:
- // content::NotificationObserver:
+ // content::NotificationObserver overrides.
virtual void Observe(int type,
const content::NotificationSource& source,
const content::NotificationDetails& details) OVERRIDE;
- // content::DevToolsFrontendHostDelegate 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 DispatchOnEmbedder(const std::string& message) OVERRIDE;
+ virtual void ReplacedWithAnotherClient() OVERRIDE;
- // DevToolsEmbedderMessageDispatcher::Delegate overrides:
+ // DevToolsEmbedderMessageDispatcher::Delegate implementation.
virtual void ActivateWindow() OVERRIDE;
virtual void CloseWindow() OVERRIDE;
virtual void SetInspectedPageBounds(const gfx::Rect& rect) OVERRIDE;
@@ -163,7 +170,7 @@ class DevToolsUIBindings : public content::NotificationObserver,
content::WebContents* web_contents_;
scoped_ptr<Delegate> delegate_;
content::NotificationRegistrar registrar_;
- scoped_ptr<content::DevToolsClientHost> frontend_host_;
+ scoped_ptr<content::DevToolsFrontendHost> frontend_host_;
scoped_ptr<DevToolsFileHelper> file_helper_;
scoped_refptr<DevToolsFileSystemIndexer> file_system_indexer_;
typedef std::map<
« no previous file with comments | « no previous file | chrome/browser/devtools/devtools_ui_bindings.cc » ('j') | content/public/browser/devtools_frontend_host.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698