Revert of Removing X11 native_event uses for key events.

ui/events/event_utils.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 UI_EVENTS_EVENT_UTILS_H_
 #define UI_EVENTS_EVENT_UTILS_H_
 
-#include "base/basictypes.h"
 #include "base/event_types.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/strings/string16.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/events/events_export.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #endif
 
@@ skipping 60 matching lines @@
 // Returns the DOM KeyboardEvent code (physical location in the
 // keyboard) from a native event.  The ownership of the return value
 // is NOT trasferred to the caller.
 EVENTS_EXPORT const char* CodeFromNative(
     const base::NativeEvent& native_event);
 
 // Returns the platform related key code. For X11, it is xksym value.
 EVENTS_EXPORT uint32 PlatformKeycodeFromNative(
     const base::NativeEvent& native_event);
 
+// Returns the windows key code. Note that this value is different from
+// KeyboardCodeFromNative (there is a divergence between ui::KeyboardCode and
+// windows key codes).
+EVENTS_EXPORT uint32 WindowsKeycodeFromNative(
+    const base::NativeEvent& native_event);
+
+// Returns the text generated by this keystroke. Used in the value we pass to
+// blink.
+EVENTS_EXPORT uint16 TextFromNative(const base::NativeEvent& native_event);
+
+// Returns the unmodified text generated by this keystroke. Used in the value
+// we pass to blink.
+EVENTS_EXPORT uint16 UnmodifiedTextFromNative(
+    const base::NativeEvent& native_event);
+
+#if defined(OS_LINUX)
 // Returns a control character sequences from a |windows_key_code|.
-EVENTS_EXPORT base::char16 GetControlCharacterForKeycode(int windows_key_code,
-                                                         bool shift);
+EVENTS_EXPORT uint16 GetControlCharacterForKeycode(int windows_key_code,
+                                                   bool shift);
+#endif
 
 // Returns true if the keyboard event is a character event rather than
 // a keystroke event.
 EVENTS_EXPORT bool IsCharFromNative(const base::NativeEvent& native_event);
 
 // Returns the flags of the button that changed during a press/release.
 EVENTS_EXPORT int GetChangedMouseButtonFlagsFromNative(
     const base::NativeEvent& native_event);
 
 // Gets the mouse wheel offsets from a native event.
@@ skipping 76 matching lines @@
 // Update the native X11 event to correspond to the new button flags.
 EVENTS_EXPORT void UpdateX11EventForChangedButtonFlags(MouseEvent* event);
 #endif
 
 // Registers a custom event type.
 EVENTS_EXPORT int RegisterCustomEventType();
 
 }  // namespace ui
 
 #endif  // UI_EVENTS_EVENT_UTILS_H_