DevTools: extract bindings from ShellDevToolsFrontend

content/shell/browser/shell_devtools_frontend.h

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 cd4f3b5acba01ce471dbad780560b6bc9f36db56..588c78c0012676bb4c527a66979181ce476622dd 100644
--- a/content/shell/browser/shell_devtools_frontend.h
+++ b/content/shell/browser/shell_devtools_frontend.h
@@ -9,27 +9,14 @@
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
-#include "base/memory/ref_counted.h"
-#include "base/memory/weak_ptr.h"
-#include "base/values.h"
-#include "content/public/browser/devtools_agent_host.h"
-#include "content/public/browser/devtools_frontend_host.h"
-#include "content/public/browser/web_contents_observer.h"
-#include "net/url_request/url_fetcher_delegate.h"
-
-namespace base {
-class Value;
-}
+#include "content/shell/browser/shell_devtools_bindings.h"

[dgozman, 2017/03/16 21:38:07]

Forward-declare it instead.

[chenwilliam, 2017/03/17 22:08:27]

I added ShellDevToolsDelegate (for closing) so I need to include it now.

 
 namespace content {
 
-class RenderViewHost;
 class Shell;
 class WebContents;
 
-class ShellDevToolsFrontend : public WebContentsObserver,
-                              public DevToolsAgentHostClient,
-                              public net::URLFetcherDelegate {
+class ShellDevToolsFrontend {
  public:
   static ShellDevToolsFrontend* Show(WebContents* inspected_contents);
 
@@ -42,44 +29,13 @@ class ShellDevToolsFrontend : public WebContentsObserver,
 
   Shell* frontend_shell() const { return frontend_shell_; }
 
-  void CallClientFunction(const std::string& function_name,
-                          const base::Value* arg1,
-                          const base::Value* arg2,
-                          const base::Value* arg3);
-
  protected:
   ShellDevToolsFrontend(Shell* frontend_shell, WebContents* inspected_contents);
-  ~ShellDevToolsFrontend() override;
-
-  // content::DevToolsAgentHostClient implementation.
-  void AgentHostClosed(DevToolsAgentHost* agent_host, bool replaced) override;
-  void DispatchProtocolMessage(DevToolsAgentHost* agent_host,
-                               const std::string& message) override;
-  void SetPreferences(const std::string& json);
-  virtual void HandleMessageFromDevToolsFrontend(const std::string& message);
+  ~ShellDevToolsFrontend();
 
  private:
-  // WebContentsObserver overrides
-  void RenderViewCreated(RenderViewHost* render_view_host) override;
-  void DocumentAvailableInMainFrame() override;
-  void WebContentsDestroyed() override;
-
-  // net::URLFetcherDelegate overrides.
-  void OnURLFetchComplete(const net::URLFetcher* source) override;
-
-  void SendMessageAck(int request_id,
-                      const base::Value* arg1);
-
   Shell* frontend_shell_;
-  WebContents* inspected_contents_;
-  scoped_refptr<DevToolsAgentHost> agent_host_;
-  int inspect_element_at_x_;
-  int inspect_element_at_y_;
-  std::unique_ptr<DevToolsFrontendHost> frontend_host_;
-  using PendingRequestsMap = std::map<const net::URLFetcher*, int>;
-  PendingRequestsMap pending_requests_;
-  base::DictionaryValue preferences_;
-  base::WeakPtrFactory<ShellDevToolsFrontend> weak_factory_;
+  std::unique_ptr<ShellDevToolsBindings> devtools_bindings_;
 
   DISALLOW_COPY_AND_ASSIGN(ShellDevToolsFrontend);
 };