Move keyboard related methods from RenderViewHostDelegate to a new RenderWidgetHostDelegate

content/browser/renderer_host/render_view_host_impl.cc

 // 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.
 
 #include "content/browser/renderer_host/render_view_host_impl.h"
 
 #include <set>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 112 matching lines @@
 ///////////////////////////////////////////////////////////////////////////////
 // RenderViewHostImpl, public:
 
 // static
 RenderViewHostImpl* RenderViewHostImpl::FromID(int render_process_id,
                                                int render_view_id) {
   return static_cast<RenderViewHostImpl*>(
       RenderViewHost::FromID(render_process_id, render_view_id));
 }
 
-RenderViewHostImpl::RenderViewHostImpl(SiteInstance* instance,
-                                       RenderViewHostDelegate* delegate,
-                                       int routing_id,
-                                       bool swapped_out,
-                                       SessionStorageNamespace* session_storage)
-    : RenderWidgetHostImpl(instance->GetProcess(), routing_id),
+RenderViewHostImpl::RenderViewHostImpl(
+    SiteInstance* instance,
+    RenderViewHostDelegate* delegate,
+    RenderWidgetHostDelegate* widget_delegate,
+    int routing_id,
+    bool swapped_out,
+    SessionStorageNamespace* session_storage)
+    : RenderWidgetHostImpl(widget_delegate, instance->GetProcess(), routing_id),
       delegate_(delegate),
       instance_(static_cast<SiteInstanceImpl*>(instance)),
       waiting_for_drag_context_response_(false),
       enabled_bindings_(0),
       guest_(false),
       pending_request_id_(-1),
       navigations_suspended_(false),
       suspended_nav_message_(NULL),
       is_swapped_out_(swapped_out),
       run_modal_reply_msg_(NULL),
@@ skipping 1241 matching lines @@
 void RenderViewHostImpl::AddObserver(
     content::RenderViewHostObserver* observer) {
   observers_.AddObserver(observer);
 }
 
 void RenderViewHostImpl::RemoveObserver(
     content::RenderViewHostObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
-bool RenderViewHostImpl::PreHandleKeyboardEvent(
-    const NativeWebKeyboardEvent& event, bool* is_keyboard_shortcut) {
-  return delegate_->PreHandleKeyboardEvent(event, is_keyboard_shortcut);
-}
-
-void RenderViewHostImpl::UnhandledKeyboardEvent(
-    const NativeWebKeyboardEvent& event) {
-  delegate_->HandleKeyboardEvent(event);
-}
-
 void RenderViewHostImpl::OnUserGesture() {
   delegate_->OnUserGesture();
 }
 
 void RenderViewHostImpl::OnMsgShouldCloseACK(
     bool proceed,
     const base::TimeTicks& renderer_before_unload_start_time,
     const base::TimeTicks& renderer_before_unload_end_time) {
   StopHangMonitorTimeout();
   // If this renderer navigated while the beforeunload request was in flight, we
@@ skipping 412 matching lines @@
   // can cause navigations to be ignored in OnMsgNavigate.
   is_waiting_for_beforeunload_ack_ = false;
   is_waiting_for_unload_ack_ = false;
 }
 
 void RenderViewHostImpl::ClearPowerSaveBlockers() {
   STLDeleteValues(&power_save_blockers_);
 }
 
 }  // namespace content