[DevTools] Move DevToolsClientHost functionality out of DevToolsFrontendHost.

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_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"
 
 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::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);
 
   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::DevToolsClientHost* frontend_host() { return frontend_host_.get(); }
 
   // 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);
  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 bool ShouldSetupDevToolsFrontendForUrl(const GURL& url) OVERRIDE;

[pfeldman, 2014/07/31 11:47:25]

Can there be a devtools frontend host that does not need a client?

[dgozman, 2014/07/31 13:05:31]

Removed.

+  virtual void HandleMessageFromDevToolsFrontend(
+      const std::string& message) OVERRIDE;
+  virtual void HandleMessageFromDevToolsFrontendToBackend(

[pfeldman, 2014/07/31 11:47:25]

New naming is really confusing.

[dgozman, 2014/07/31 13:05:31]

Next step is removing this method (see TODO in devtools_frontend_host.h), so it
will not live long. And I can't come up with much better name.

+      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;
   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;
   virtual void SetIsDocked(bool is_docked) OVERRIDE;
   virtual void OpenInNewTab(const std::string& url) OVERRIDE;
@@ skipping 59 matching lines @@
   void AddDevToolsExtensionsToClient();
 
   class FrontendWebContentsObserver;
   friend class FrontendWebContentsObserver;
   scoped_ptr<FrontendWebContentsObserver> frontend_contents_observer_;
 
   Profile* profile_;
   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<
       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_