Move keyboard related methods from RenderViewHostDelegate to a new RenderWidgetHostDelegate

content/browser/renderer_host/render_widget_host_impl.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_RENDERER_HOST_RENDER_WIDGET_HOST_IMPL_H_
 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_IMPL_H_
 #pragma once
 
 #include <deque>
 #include <string>
@@ skipping 30 matching lines @@
 
 namespace WebKit {
 class WebInputEvent;
 class WebMouseEvent;
 struct WebCompositionUnderline;
 struct WebScreenInfo;
 }
 
 namespace content {
 
+class RenderWidgetHostDelegate;
 class RenderWidgetHostViewPort;
 class TapSuppressionController;
 
 // This implements the RenderWidgetHost interface that is exposed to
 // embedders of content, and adds things only visible to content.
 class CONTENT_EXPORT RenderWidgetHostImpl : virtual public RenderWidgetHost,
                                             public IPC::Channel::Listener {
  public:
   // routing_id can be MSG_ROUTING_NONE, in which case the next available
   // routing id is taken from the RenderProcessHost.
-  RenderWidgetHostImpl(RenderProcessHost* process, int routing_id);
+  RenderWidgetHostImpl(RenderWidgetHostDelegate* delegate,
+                       RenderProcessHost* process,
+                       int routing_id);
   virtual ~RenderWidgetHostImpl();
 
   // Use RenderWidgetHostImpl::From(rwh) to downcast a
   // RenderWidgetHost to a RenderWidgetHostImpl.  Internally, this
   // uses RenderWidgetHost::AsRenderWidgetHostImpl().
   static RenderWidgetHostImpl* From(RenderWidgetHost* rwh);
 
   // RenderWidgetHost implementation.
   virtual void Undo() OVERRIDE;
   virtual void Redo() OVERRIDE;
@@ skipping 298 matching lines @@
   void RendererExited(base::TerminationStatus status, int exit_code);
 
   // Retrieves an id the renderer can use to refer to its view.
   // This is used for various IPC messages, including plugins.
   gfx::NativeViewId GetNativeViewId() const;
 
   // Retrieves an id for the surface that the renderer can draw to
   // when accelerated compositing is enabled.
   gfx::GLSurfaceHandle GetCompositingSurface();
 
-  // Called to handled a keyboard event before sending it to the renderer.
-  // This is overridden by RenderViewHost to send upwards to its delegate.
-  // Returns true if the event was handled, and then the keyboard event will
-  // not be sent to the renderer anymore. Otherwise, if the |event| would
-  // be handled in HandleKeyboardEvent() method as a normal keyboard shortcut,
-  // |*is_keyboard_shortcut| should be set to true.
-  virtual bool PreHandleKeyboardEvent(const NativeWebKeyboardEvent& event,
-                                      bool* is_keyboard_shortcut);
-
   // "RenderWidgetHostDelegate" ------------------------------------------------
   // There is no RenderWidgetHostDelegate but the following methods serve the
   // same purpose. They are overridden by RenderViewHost to send upwards to its
   // delegate.
 
-  // Called when a keyboard event was not processed by the renderer.
-  virtual void UnhandledKeyboardEvent(const NativeWebKeyboardEvent& event) {}
-
   // Called when a mousewheel event was not processed by the renderer.
   virtual void UnhandledWheelEvent(const WebKit::WebMouseWheelEvent& event) {}
 
   // Notification that the user has made some kind of input that could
   // perform an action. The gestures that count are 1) any mouse down
   // event and 2) enter or space key presses.
   virtual void OnUserGesture() {}
 
   // Callbacks for notification when the renderer becomes unresponsive to user
   // input events, and subsequently responsive again.
@@ skipping 147 matching lines @@
 
   // Called on OnMsgInputEventAck() to process a touch event ack message.
   // This can result in a gesture event being generated and sent back to the
   // renderer.
   void ProcessTouchAck(WebKit::WebInputEvent::Type type, bool processed);
 
   // Called when there is a new auto resize (using a post to avoid a stack
   // which may get in recursive loops).
   void DelayedAutoResized();
 
+  // Our delegate, which wants to know mainly about keyboard events.
+  RenderWidgetHostDelegate* delegate_;
+
   // Created during construction but initialized during Init*(). Therefore, it
   // is guaranteed never to be NULL, but its channel may be NULL if the
   // renderer crashed, so you must always check that.
   RenderProcessHost* process_;
 
   // The ID of the corresponding object in the Renderer Instance.
   int routing_id_;
 
   // Stores random bits of data for others to associate with this object.
   base::PropertyBag property_bag_;
@@ skipping 149 matching lines @@
   base::WeakPtrFactory<RenderWidgetHostImpl> weak_factory_;
 
   scoped_ptr<TapSuppressionController> tap_suppression_controller_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_IMPL_H_