RenderWidgetHost now stores both the WebKeyboardEvent and the native

chrome/browser/renderer_host/render_widget_host.h

 // Copyright (c) 2006-2008 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_RENDERER_HOST_RENDER_WIDGET_HOST_H_
 #define CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_H_
 
 #include <queue>
 #include <vector>
 
 #include "base/gfx/size.h"
 #include "base/timer.h"
 #include "chrome/common/ipc_channel.h"
+#include "chrome/common/native_web_keyboard_event.h"
 #include "testing/gtest/include/gtest/gtest_prod.h"
 #include "webkit/glue/webinputevent.h"
 
 namespace gfx {
 class Rect;
 }
 
 class BackingStore;
 class PaintObserver;
 class RenderProcessHost;
 class RenderWidgetHostView;
 class TransportDIB;
 class WebInputEvent;
-class WebKeyboardEvent;
 class WebMouseEvent;
 class WebMouseWheelEvent;
 class WebCursor;
 struct ViewHostMsg_PaintRect_Params;
 struct ViewHostMsg_ScrollRect_Params;
 
 // This class manages the browser side of a browser<->renderer HWND connection.
 // The HWND lives in the browser process, and windows events are sent over
 // IPC to the corresponding object in the renderer.  The renderer paints into
 // shared memory, which we transfer to a backing store and blit to the screen
@@ skipping 163 matching lines @@
 
   // Called when the system theme changes. At this time all existing native
   // theme handles are invalid and the renderer must obtain new ones and
   // repaint.
   void SystemThemeChanged();
 
   // Forwards the given message to the renderer. These are called by the view
   // when it has received a message.
   void ForwardMouseEvent(const WebMouseEvent& mouse_event);
   void ForwardWheelEvent(const WebMouseWheelEvent& wheel_event);
-  void ForwardKeyboardEvent(const WebKeyboardEvent& key_event);
-  void ForwardInputEvent(const WebInputEvent& input_event, int event_size);
+  void ForwardKeyboardEvent(const NativeWebKeyboardEvent& key_event);
 
   // This is for derived classes to give us access to the resizer rect.
   // And to also expose it to the RenderWidgetHostView.
   virtual gfx::Rect GetRootWindowResizerRect() const;
 
  protected:
+  // Internal implementation of the public Forward*Event() methods.
+  void ForwardInputEvent(const WebInputEvent& input_event, int event_size);
+
   // Called when we receive a notification indicating that the renderer
   // process has gone. This will reset our state so that our state will be
   // consistent if a new renderer is created.
   void RendererExited();
 
   // Called when we an InputEvent was not processed by the renderer. This is
   // overridden by RenderView to send upwards to its delegate.
-  virtual void UnhandledKeyboardEvent(const WebKeyboardEvent& event) {}
+  virtual void UnhandledKeyboardEvent(const NativeWebKeyboardEvent& event) {}
 
   // Notification that the user pressed the enter key or the spacebar. The
   // render view host overrides this to forward the information to its delegate
   // (see corresponding function in RenderViewHostDelegate).
   virtual void OnEnterOrSpace() {}
 
   // Callbacks for notification when the renderer becomes unresponsive to user
   // input events, and subsequently responsive again. RenderViewHost overrides
   // these to tell its delegate to show the user a warning.
   virtual void NotifyRendererUnresponsive() {}
@@ skipping 109 matching lines @@
   scoped_ptr<PaintObserver> paint_observer_;
 
   // Set when we call DidPaintRect/DidScrollRect on the view.
   bool view_being_painted_;
 
   // Used for UMA histogram logging to measure the time for a repaint view
   // operation to finish.
   base::TimeTicks repaint_start_time_;
 
   // Queue of keyboard events that we need to track.
-  typedef std::queue<WebKeyboardEvent> KeyQueue;
+  typedef std::queue<NativeWebKeyboardEvent> KeyQueue;
 
   // A queue of keyboard events. We can't trust data from the renderer so we
   // stuff key events into a queue and pop them out on ACK, feeding our copy
   // back to whatever unhandled handler instead of the returned version.
   KeyQueue key_queue_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderWidgetHost);
 };
 
 #endif  // CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_H_