Refactors NativeWebKeyboardEvent to be less ugly.

Replaces #ifdefs in the source file with use of a new gfx::NativeEvent typedef.

Adds NativeWebKeyboardEventAura.

http://crbug.com/99757
TEST=none
Review URL: http://codereview.chromium.org/8302013

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

2 files changed, 2 insertions, 30 deletions

diff --git a/chrome/common/native_web_keyboard_event_aura.cc b/chrome/common/native_web_keyboard_event_aura.cc
deleted file mode 100644
index 88405e00..0000000
--- a/chrome/common/native_web_keyboard_event_aura.cc
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright (c) 2011 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/public/browser/native_web_keyboard_event.h"
-
-#if !defined(OS_WIN)
-
-NativeWebKeyboardEvent::NativeWebKeyboardEvent()
-    : skip_in_browser(false) {
-}
-
-NativeWebKeyboardEvent::NativeWebKeyboardEvent(
-    const NativeWebKeyboardEvent& other)
-    : skip_in_browser(other.skip_in_browser) {
-}
-
-NativeWebKeyboardEvent& NativeWebKeyboardEvent::operator=(
-    const NativeWebKeyboardEvent& other) {
-  skip_in_browser = other.skip_in_browser;
-  return *this;
-}
-
-NativeWebKeyboardEvent::~NativeWebKeyboardEvent() {
-}
-
-#endif
diff --git a/chrome/common/native_web_keyboard_event_views.cc b/chrome/common/native_web_keyboard_event_views.cc
index f36f668..e419fb1 100644
--- a/chrome/common/native_web_keyboard_event_views.cc
+++ b/chrome/common/native_web_keyboard_event_views.cc
@@ -50,9 +50,8 @@ NativeWebKeyboardEventViews::NativeWebKeyboardEventViews(
   os_event = event.native_event();
 #elif defined(TOOLKIT_USES_GTK)
   if (event.gdk_event()) {
-    os_event =
-        reinterpret_cast<GdkEventKey*>(gdk_event_copy(event.gdk_event()));
-    nativeKeyCode = os_event->keyval;
+    os_event = gdk_event_copy(event.gdk_event());
+    nativeKeyCode = os_event->key.keyval;
   } else {
     os_event = NULL;
   }