[DevTools] Make DevTools clients talk directly to DevToolsAgentHost instead of using DevToolsManage…

chrome/browser/devtools/devtools_ui_bindings.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_DEVTOOLS_DEVTOOLS_UI_BINDINGS_H_
 #define CHROME_BROWSER_DEVTOOLS_DEVTOOLS_UI_BINDINGS_H_
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/string16.h"
 #include "chrome/browser/devtools/device/devtools_android_bridge.h"
 #include "chrome/browser/devtools/devtools_embedder_message_dispatcher.h"
 #include "chrome/browser/devtools/devtools_file_helper.h"
 #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_agent_host.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"
 
 class InfoBarService;
 class Profile;
 
 namespace content {
-class DevToolsClientHost;
 struct FileChooserParams;
 class WebContents;
 }
 
 // Base implementation of DevTools bindings around front-end.
 class DevToolsUIBindings : public content::NotificationObserver,
                            public content::DevToolsFrontendHost::Delegate,
                            public DevToolsEmbedderMessageDispatcher::Delegate,
                            public DevToolsAndroidBridge::DeviceCountListener,
-                           public content::DevToolsClientHost {
+                           public content::DevToolsAgentHost::Client {
  public:
   static GURL ApplyThemeToURL(Profile* profile, const GURL& base_url);
 
   class Delegate {
    public:
     virtual ~Delegate() {}
     virtual void ActivateWindow() = 0;
     virtual void CloseWindow() = 0;
     virtual void SetInspectedPageBounds(const gfx::Rect& rect) = 0;
     virtual void SetContentsResizingStrategy(
         const gfx::Insets& insets, const gfx::Size& min_size) = 0;
     virtual void InspectElementCompleted() = 0;
     virtual void MoveWindow(int x, int y) = 0;
     virtual void SetIsDocked(bool is_docked) = 0;
     virtual void OpenInNewTab(const std::string& url) = 0;
     virtual void SetWhitelistedShortcuts(const std::string& message) = 0;
 
     virtual void InspectedContentsClosing() = 0;
     virtual void OnLoadCompleted() = 0;
     virtual InfoBarService* GetInfoBarService() = 0;
     virtual void RenderProcessGone() = 0;
   };
 
   DevToolsUIBindings(content::WebContents* web_contents, const GURL& url);
   virtual ~DevToolsUIBindings();
 
   content::WebContents* web_contents() { return web_contents_; }
   Profile* profile() { return profile_; }
+  content::DevToolsAgentHost* agent_host() { return agent_host_.get(); }

[pfeldman, 2014/08/07 15:40:30]

Lets not expose it.

[dgozman, 2014/08/07 16:51:51]

Done.

 
   // Takes ownership over the |delegate|.
   void SetDelegate(Delegate* delegate);
   void CallClientFunction(const std::string& function_name,
                           const base::Value* arg1,
                           const base::Value* arg2,
                           const base::Value* arg3);
+  void InspectAgentHost(content::DevToolsAgentHost* agent_host);

[pfeldman, 2014/08/07 15:40:30]

AttachTo(DTAH)

[dgozman, 2014/08/07 16:51:51]

Done.

  private:
   // content::NotificationObserver overrides.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) 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;
+  // content::DevToolsAgentHost::Client implementation.
+  virtual void SendMessageFromAgentHost(

[pfeldman, 2014/08/07 15:40:30]

DispatchProtocolMessage

[dgozman, 2014/08/07 16:51:51]

Done.

+      content::DevToolsAgentHost* agent_host,
+      const std::string& message) OVERRIDE;
+  virtual void AgentHostDetached(

[pfeldman, 2014/08/07 15:40:30]

AgentHostClosed

[dgozman, 2014/08/07 16:51:51]

Done.

+      content::DevToolsAgentHost* agent_host,
+      content::DevToolsAgentHost::DetachReason reason) OVERRIDE;
 
   // DevToolsEmbedderMessageDispatcher::Delegate implementation.
   virtual void ActivateWindow() OVERRIDE;
   virtual void CloseWindow() OVERRIDE;
   virtual void SetInspectedPageBounds(const gfx::Rect& rect) OVERRIDE;
   virtual void SetContentsResizingStrategy(
       const gfx::Insets& insets, const gfx::Size& min_size) OVERRIDE;
   virtual void InspectElementCompleted() OVERRIDE;
   virtual void InspectedURLChanged(const std::string& url) OVERRIDE;
   virtual void MoveWindow(int x, int y) OVERRIDE;
@@ skipping 61 matching lines @@
   void UpdateTheme();
   void AddDevToolsExtensionsToClient();
 
   class FrontendWebContentsObserver;
   friend class FrontendWebContentsObserver;
   scoped_ptr<FrontendWebContentsObserver> frontend_contents_observer_;
 
   Profile* profile_;
   content::WebContents* web_contents_;
   scoped_ptr<Delegate> delegate_;
+  scoped_refptr<content::DevToolsAgentHost> agent_host_;
   content::NotificationRegistrar registrar_;
   scoped_ptr<content::DevToolsFrontendHost> frontend_host_;
   scoped_ptr<DevToolsFileHelper> file_helper_;
   scoped_refptr<DevToolsFileSystemIndexer> file_system_indexer_;
   typedef std::map<
       int,
       scoped_refptr<DevToolsFileSystemIndexer::FileSystemIndexingJob> >
       IndexingJobsMap;
   IndexingJobsMap indexing_jobs_;
 
   bool device_count_updates_enabled_;
   bool devices_updates_enabled_;
   scoped_ptr<DevToolsTargetsUIHandler> remote_targets_handler_;
   scoped_ptr<DevToolsEmbedderMessageDispatcher> embedder_message_dispatcher_;
   GURL url_;
   base::WeakPtrFactory<DevToolsUIBindings> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DevToolsUIBindings);
 };
 
 #endif  // CHROME_BROWSER_DEVTOOLS_DEVTOOLS_UI_BINDINGS_H_