aura: Fix shift/ctrl/alt keyevents with RWHVA and X11.

ui/base/keycodes/keyboard_code_conversion_gtk.cc

 // 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.
 
 /*
  * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.
  * Copyright (C) 2006 Michael Emmel mike.emmel@gmail.com
  * Copyright (C) 2007 Holger Hans Peter Freyther
  * Copyright (C) 2008 Collabora, Ltd.  All rights reserved.
  * Copyright (C) 2008, 2009 Google Inc.
@@ skipping 21 matching lines @@
  */
 
 // WindowsKeyCodeForGdkKeyCode is copied from platform/gtk/KeyEventGtk.cpp
 
 #include "ui/base/keycodes/keyboard_code_conversion_gtk.h"
 
 #include <gdk/gdk.h>
 #include <gdk/gdkkeysyms.h>
 
 #include "build/build_config.h"
+#include "ui/base/keycodes/keyboard_code_conversion_x.h"
 #include "ui/base/keycodes/keyboard_codes_posix.h"
 
-#ifdef USE_X11
-#include "ui/base/keycodes/keyboard_code_conversion_x.h"
-#endif
-
 namespace ui {
 
 KeyboardCode WindowsKeyCodeForGdkKeyCode(int keycode) {
   switch (keycode) {
     case GDK_KP_0:
       return VKEY_NUMPAD0;  // (60) Numeric keypad 0 key
     case GDK_KP_1:
       return VKEY_NUMPAD1;  // (61) Numeric keypad 1 key
     case GDK_KP_2:
       return  VKEY_NUMPAD2;  // (62) Numeric keypad 2 key
@@ skipping 572 matching lines @@
   if (keyval && gdk_keymap_get_entries_for_keyval(0, keyval, &keys, &n_keys)) {
     native_keycode = keys[0].keycode;
     g_free(keys);
   }
 
   return native_keycode;
 }
 
 KeyboardCode KeyboardCodeFromGdkEventKey(GdkEventKey* event) {
   KeyboardCode keycode = WindowsKeyCodeForGdkKeyCode(event->keyval);
-#ifdef USE_X11
   // Gtk's key values are same as X11's keysyms.
   if (keycode == VKEY_UNKNOWN) {
     unsigned int keyval =
         DefaultXKeysymFromHardwareKeycode(event->hardware_keycode);
     keycode = WindowsKeyCodeForGdkKeyCode(keyval);
   }
-#endif
   return keycode;
 }
 
 }  // namespace ui