[DevTools] Move input handler to RenderWidgetHost.

BUG=470453

Review URL: https://codereview.chromium.org/1084443002

Cr-Commit-Position: refs/heads/master@{#324834}

3 files changed, 9 insertions, 9 deletions

diff --git a/content/browser/devtools/protocol/input_handler.cc b/content/browser/devtools/protocol/input_handler.cc
index aaa7523..4c460e9 100644
--- a/content/browser/devtools/protocol/input_handler.cc
+++ b/content/browser/devtools/protocol/input_handler.cc
@@ -6,7 +6,7 @@
 
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
-#include "content/browser/renderer_host/render_view_host_impl.h"
+#include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "third_party/WebKit/public/web/WebInputEvent.h"
 #include "ui/events/keycodes/dom4/keycode_converter.h"
 
@@ -93,7 +93,7 @@ InputHandler::InputHandler()
 InputHandler::~InputHandler() {
 }
 
-void InputHandler::SetRenderViewHost(RenderViewHostImpl* host) {
+void InputHandler::SetRenderWidgetHost(RenderWidgetHostImpl* host) {
   host_ = host;
 }
 
diff --git a/content/browser/devtools/protocol/input_handler.h b/content/browser/devtools/protocol/input_handler.h
index 0965356..cae6fb5 100644
--- a/content/browser/devtools/protocol/input_handler.h
+++ b/content/browser/devtools/protocol/input_handler.h
@@ -9,7 +9,7 @@
 
 namespace content {
 
-class RenderViewHostImpl;
+class RenderWidgetHostImpl;
 
 namespace devtools {
 namespace input {
@@ -21,7 +21,7 @@ class InputHandler {
   InputHandler();
   virtual ~InputHandler();
 
-  void SetRenderViewHost(RenderViewHostImpl* host);
+  void SetRenderWidgetHost(RenderWidgetHostImpl* host);
   void SetClient(scoped_ptr<DevToolsProtocolClient> client);
 
   Response DispatchKeyEvent(const std::string& type,
@@ -81,7 +81,7 @@ class InputHandler {
                                 const std::string* gesture_source_type);
 
  private:
-  RenderViewHostImpl* host_;
+  RenderWidgetHostImpl* host_;
 
   DISALLOW_COPY_AND_ASSIGN(InputHandler);
 };
diff --git a/content/browser/devtools/render_frame_devtools_agent_host.cc b/content/browser/devtools/render_frame_devtools_agent_host.cc
index ba5757e..09ecb59 100644
--- a/content/browser/devtools/render_frame_devtools_agent_host.cc
+++ b/content/browser/devtools/render_frame_devtools_agent_host.cc
@@ -408,12 +408,12 @@ void RenderFrameDevToolsAgentHost::SetRenderFrameHost(RenderFrameHost* rfh) {
   DCHECK(ShouldCreateDevToolsFor(rfh));
   DCHECK(!render_frame_host_);
   render_frame_host_ = static_cast<RenderFrameHostImpl*>(rfh);
+  DCHECK(render_frame_host_);
 
   WebContentsObserver::Observe(WebContents::FromRenderFrameHost(rfh));
-  RenderViewHostImpl* rvh = static_cast<RenderViewHostImpl*>(
-      rfh->GetRenderViewHost());
   dom_handler_->SetRenderFrameHost(render_frame_host_);
-  input_handler_->SetRenderViewHost(rvh);
+  input_handler_->SetRenderWidgetHost(
+      render_frame_host_->GetRenderWidgetHost());
   network_handler_->SetRenderFrameHost(render_frame_host_);
   service_worker_handler_->SetRenderFrameHost(render_frame_host_);
 
@@ -429,7 +429,7 @@ void RenderFrameDevToolsAgentHost::ClearRenderFrameHost() {
   dom_handler_->SetRenderFrameHost(nullptr);
   if (emulation_handler_)
     emulation_handler_->SetRenderFrameHost(nullptr);
-  input_handler_->SetRenderViewHost(nullptr);
+  input_handler_->SetRenderWidgetHost(nullptr);
   network_handler_->SetRenderFrameHost(nullptr);
   if (page_handler_)
     page_handler_->SetRenderFrameHost(nullptr);