Reverting 10794.

Review URL: http://codereview.chromium.org/40027

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10808 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 11 insertions, 5 deletions

diff --git a/chrome/browser/renderer_host/render_view_host.cc b/chrome/browser/renderer_host/render_view_host.cc
index 9f174fa..f4349a1 100644
--- a/chrome/browser/renderer_host/render_view_host.cc
+++ b/chrome/browser/renderer_host/render_view_host.cc
@@ -1211,8 +1211,7 @@ void RenderViewHost::UnhandledKeyboardEvent(const WebKeyboardEvent& event) {
     // TODO(brettw) why do we have to filter these types of events here. Can't
     // the renderer just send us the ones we care abount, or maybe the view
     // should be able to decide which ones it wants or not?
-    if ((event.type == WebInputEvent::RAW_KEY_DOWN) ||
-        (event.type == WebInputEvent::KEY_DOWN) ||
+    if ((event.type == WebInputEvent::KEY_DOWN) ||
         (event.type == WebInputEvent::CHAR)) {
       view->HandleKeyboardEvent(event);
     }
diff --git a/chrome/browser/renderer_host/render_widget_host.cc b/chrome/browser/renderer_host/render_widget_host.cc
index 6951e3d..1050ec7 100644
--- a/chrome/browser/renderer_host/render_widget_host.cc
+++ b/chrome/browser/renderer_host/render_widget_host.cc
@@ -293,8 +293,8 @@ void RenderWidgetHost::ForwardWheelEvent(
 
 void RenderWidgetHost::ForwardKeyboardEvent(const WebKeyboardEvent& key_event) {
   if (key_event.type == WebKeyboardEvent::CHAR &&
-      (key_event.windows_key_code == base::VKEY_RETURN ||
-       key_event.windows_key_code == base::VKEY_SPACE)) {
+      (key_event.key_code == base::VKEY_RETURN ||
+       key_event.key_code == base::VKEY_SPACE)) {
     OnEnterOrSpace();
   }
 
diff --git a/chrome/browser/renderer_host/render_widget_host_unittest.cc b/chrome/browser/renderer_host/render_widget_host_unittest.cc
index da37f01..ad677c1 100644
--- a/chrome/browser/renderer_host/render_widget_host_unittest.cc
+++ b/chrome/browser/renderer_host/render_widget_host_unittest.cc
@@ -330,7 +330,7 @@ TEST_F(RenderWidgetHostTest, HandleKeyEventsWeSent) {
   WebKeyboardEvent key_event;
   key_event.type = WebInputEvent::KEY_DOWN;
   key_event.modifiers = WebInputEvent::CTRL_KEY;
-  key_event.windows_key_code = base::VKEY_L;  // non-null made up value.
+  key_event.key_code = base::VKEY_L;  // non-null made up value.
 
   host_->ForwardKeyboardEvent(key_event);
 
diff --git a/chrome/browser/renderer_host/render_widget_host_view_gtk.cc b/chrome/browser/renderer_host/render_widget_host_view_gtk.cc
index 13c1eb2..750cb48f 100644
--- a/chrome/browser/renderer_host/render_widget_host_view_gtk.cc
+++ b/chrome/browser/renderer_host/render_widget_host_view_gtk.cc
@@ -77,6 +77,13 @@ class RenderWidgetHostViewGtkWidget {
                                        RenderWidgetHostViewGtk* host_view) {
     WebKeyboardEvent wke(event);
     host_view->GetRenderWidgetHost()->ForwardKeyboardEvent(wke);
+
+    // See note in webwidget_host_gtk.cc::HandleKeyPress().
+    if (event->type == GDK_KEY_PRESS) {
+      wke.type = WebKeyboardEvent::CHAR;
+      host_view->GetRenderWidgetHost()->ForwardKeyboardEvent(wke);
+    }
+
     return FALSE;
   }