Fix Chromoting under Ozone.

content/browser/renderer_host/web_input_event_aura.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 "content/browser/renderer_host/web_input_event_aura.h"
 
 #include "content/browser/renderer_host/input/web_input_event_util.h"
 #include "content/browser/renderer_host/ui_events_helper.h"
 #include "ui/aura/window.h"
 #include "ui/events/event.h"
 #include "ui/events/event_utils.h"
-
-#if defined(USE_X11) || defined(USE_OZONE)
 #include "ui/events/keycodes/dom4/keycode_converter.h"
-#endif
 
 namespace content {
 
 #if defined(OS_WIN)
 blink::WebMouseEvent MakeUntranslatedWebMouseEventFromNativeEvent(
     const base::NativeEvent& native_event);
 blink::WebMouseWheelEvent MakeUntranslatedWebMouseWheelEventFromNativeEvent(
     const base::NativeEvent& native_event);
 blink::WebKeyboardEvent MakeWebKeyboardEventFromNativeEvent(
     const base::NativeEvent& native_event);
 blink::WebGestureEvent MakeWebGestureEventFromNativeEvent(
     const base::NativeEvent& native_event);
 #endif
-#if defined(USE_X11) || defined(USE_OZONE)
+
 blink::WebKeyboardEvent MakeWebKeyboardEventFromAuraEvent(
     const ui::KeyEvent& event) {
   blink::WebKeyboardEvent webkit_event;
 
   webkit_event.timeStampSeconds = event.time_stamp().InSecondsF();
   webkit_event.modifiers = EventFlagsToWebEventModifiers(event.flags());
 
   switch (event.type()) {
     case ui::ET_KEY_PRESSED:
       webkit_event.type = event.is_char() ? blink::WebInputEvent::Char :
@@ skipping 72 matching lines @@
     default:
       NOTREACHED() << "Unknown gesture type: " << event.type();
   }
 
   webkit_event.sourceDevice = blink::WebGestureDeviceTouchpad;
   webkit_event.modifiers = EventFlagsToWebEventModifiers(event.flags());
   webkit_event.timeStampSeconds = event.time_stamp().InSecondsF();
   return webkit_event;
 }
 
-#endif
-
 blink::WebMouseEvent MakeWebMouseEventFromAuraEvent(
     const ui::MouseEvent& event);
 blink::WebMouseWheelEvent MakeWebMouseWheelEventFromAuraEvent(
     const ui::MouseWheelEvent& event);
 
 // General approach:
 //
 // ui::Event only carries a subset of possible event data provided to Aura by
 // the host platform. WebKit utilizes a larger subset of that information than
 // Aura itself. WebKit includes some built in cracking functionality that we
@@ skipping 90 matching lines @@
 }
 
 blink::WebKeyboardEvent MakeWebKeyboardEvent(const ui::KeyEvent& event) {
   // Windows can figure out whether or not to construct a RawKeyDown or a Char
   // WebInputEvent based on the type of message carried in
   // event.native_event(). X11 is not so fortunate, there is no separate
   // translated event type, so DesktopHostLinux sends an extra KeyEvent with
   // is_char() == true. We need to pass the ui::KeyEvent to the X11 function
   // to detect this case so the right event type can be constructed.
 #if defined(OS_WIN)
-  if (!event.HasNativeEvent())
-    return blink::WebKeyboardEvent();
-
-  // Key events require no translation by the aura system.
-  return MakeWebKeyboardEventFromNativeEvent(event.native_event());
-#else
+  if (event.HasNativeEvent()) {
+    // Key events require no translation by the aura system.
+    return MakeWebKeyboardEventFromNativeEvent(event.native_event());
+  }
+#endif
   return MakeWebKeyboardEventFromAuraEvent(event);
-#endif
 }
 
 blink::WebGestureEvent MakeWebGestureEvent(const ui::GestureEvent& event) {
   blink::WebGestureEvent gesture_event;
 #if defined(OS_WIN)
   if (event.HasNativeEvent())
     gesture_event = MakeWebGestureEventFromNativeEvent(event.native_event());
   else
     gesture_event = MakeWebGestureEventFromUIEvent(event);
 #else
@@ skipping 102 matching lines @@
     webkit_event.deltaY = event.y_offset();
   }
 
   webkit_event.wheelTicksX = webkit_event.deltaX / kPixelsPerTick;
   webkit_event.wheelTicksY = webkit_event.deltaY / kPixelsPerTick;
 
   return webkit_event;
 }
 
 }  // namespace content