DevTools: migrate DevTools APIs to use WebContents instead of RenderViewHost.

content/browser/devtools/render_view_devtools_agent_host.h

 // Copyright (c) 2012 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 CONTENT_BROWSER_DEVTOOLS_RENDER_VIEW_DEVTOOLS_AGENT_HOST_H_
 #define CONTENT_BROWSER_DEVTOOLS_RENDER_VIEW_DEVTOOLS_AGENT_HOST_H_
 
 #include <map>
 
 #include "base/basictypes.h"
@@ skipping 21 matching lines @@
 #endif
 
 class CONTENT_EXPORT RenderViewDevToolsAgentHost
     : public IPCDevToolsAgentHost,
       private WebContentsObserver,
       public NotificationObserver {
  public:
   static void OnCancelPendingNavigation(RenderViewHost* pending,
                                         RenderViewHost* current);
 
-  static bool DispatchIPCMessage(RenderViewHost* source,
-                                 const IPC::Message& message);
-
   RenderViewDevToolsAgentHost(RenderViewHost*);
 
-  RenderViewHost* render_view_host() { return render_view_host_; }
-
   void SynchronousSwapCompositorFrame(
       const cc::CompositorFrameMetadata& frame_metadata);
 
+  // DevTooolsAgentHost overrides.
+  virtual void DisconnectWebContents() OVERRIDE;
+  virtual void ConnectWebContents(WebContents* web_contents) OVERRIDE;
+  virtual WebContents* GetWebContents() OVERRIDE;
+
  private:
   friend class DevToolsAgentHost;
-
   virtual ~RenderViewDevToolsAgentHost();
 
-  // DevTooolsAgentHost overrides.
-  virtual void DisconnectRenderViewHost() OVERRIDE;
-  virtual void ConnectRenderViewHost(RenderViewHost* rvh) OVERRIDE;
-  virtual RenderViewHost* GetRenderViewHost() OVERRIDE;
-
   // IPCDevToolsAgentHost overrides.
   virtual void DispatchOnInspectorBackend(const std::string& message) OVERRIDE;
   virtual void SendMessageToAgent(IPC::Message* msg) OVERRIDE;
   virtual void OnClientAttached() OVERRIDE;
   virtual void OnClientDetached() OVERRIDE;
 
   // WebContentsObserver overrides.
   virtual void AboutToNavigateRenderView(RenderViewHost* dest_rvh) OVERRIDE;
   virtual void RenderViewHostChanged(RenderViewHost* old_host,
                                      RenderViewHost* new_host) OVERRIDE;
   virtual void RenderViewDeleted(RenderViewHost* rvh) OVERRIDE;
   virtual void RenderProcessGone(base::TerminationStatus status) OVERRIDE;
+  virtual bool OnMessageReceived(const IPC::Message& message,
+                                 RenderFrameHost* render_frame_host) OVERRIDE;
+  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
   virtual void DidAttachInterstitialPage() OVERRIDE;
 
   // NotificationObserver overrides:
   virtual void Observe(int type,
                        const NotificationSource& source,
                        const NotificationDetails& details) OVERRIDE;
 
+  void DisconnectRenderViewHost();
+  void ConnectRenderViewHost(RenderViewHost* rvh);
   void ReattachToRenderViewHost(RenderViewHost* rvh);
 
   bool DispatchIPCMessage(const IPC::Message& message);
 
   void SetRenderViewHost(RenderViewHost* rvh);
   void ClearRenderViewHost();
 
   void RenderViewCrashed();
   void OnSwapCompositorFrame(const IPC::Message& message);
   bool OnSetTouchEventEmulationEnabled(const IPC::Message& message);
@@ skipping 16 matching lines @@
   std::string state_;
   NotificationRegistrar registrar_;
   bool reattaching_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderViewDevToolsAgentHost);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_DEVTOOLS_RENDER_VIEW_DEVTOOLS_AGENT_HOST_H_