Removing X11 native_event uses for key events.

ui/events/event_utils.cc

 // 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.
 
 #include "ui/events/event_utils.h"
 
 #include <vector>
 
 #include "ui/events/event.h"
 #include "ui/gfx/display.h"
@@ skipping 45 matching lines @@
     case ET_TOUCH_CANCELLED:
       event.reset(new TouchEvent(native_event));
       break;
 
     default:
       break;
   }
   return event.Pass();
 }
 
-#if defined(OS_LINUX)
 // From third_party/WebKit/Source/web/gtk/WebInputEventFactory.cpp:
-uint16 GetControlCharacterForKeycode(int windows_key_code, bool shift) {
+base::char16 GetControlCharacterForKeycode(int windows_key_code, bool shift) {
   if (windows_key_code >= ui::VKEY_A &&
     windows_key_code <= ui::VKEY_Z) {
     // ctrl-A ~ ctrl-Z map to \x01 ~ \x1A
     return windows_key_code - ui::VKEY_A + 1;
   }
   if (shift) {
     // following graphics chars require shift key to input.
     switch (windows_key_code) {
       // ctrl-@ maps to \x00 (Null byte)
       case ui::VKEY_2:
@@ skipping 22 matching lines @@
       // ctrl-Enter maps to \x0A (Line feed)
       case ui::VKEY_RETURN:
         return 0x0A;
       // Returns 0 for all other keys to avoid inputting unexpected chars.
       default:
         break;
     }
   }
   return 0;
 }
-#endif
 
 int RegisterCustomEventType() {
   return ++g_custom_event_types;
 }
 
 base::TimeDelta EventTimeForNow() {
   return base::TimeDelta::FromInternalValue(
       base::TimeTicks::Now().ToInternalValue());
 }
 
@@ skipping 10 matching lines @@
   const std::vector<gfx::Display>& displays = screen->GetAllDisplays();
   for (std::vector<gfx::Display>::const_iterator it = displays.begin();
        it != displays.end(); ++it) {
     if (it->IsInternal())
       return it->touch_support();
   }
   return gfx::Display::TOUCH_SUPPORT_UNAVAILABLE;
 }
 
 }  // namespace ui