Revert "Revert 224496 "Move ui/base/latency_info* to ui/events""

ui/events/event_utils.h

Index: ui/events/event_utils.h
diff --git a/ui/events/event_utils.h b/ui/events/event_utils.h
index ed74eb19f5f20ea2ebe981b56c5db231c611efb4..bcf1213855ea9675b0954edd62aedc4bd9fc8fc3 100644
--- a/ui/events/event_utils.h
+++ b/ui/events/event_utils.h
@@ -9,6 +9,7 @@
 #include "ui/events/event_constants.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/native_widget_types.h"
+#include "ui/events/events_export.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
@@ -28,30 +29,31 @@ namespace ui {
 class Event;
 
 // Updates the list of devices for cached properties.
-UI_EXPORT void UpdateDeviceList();
+EVENTS_EXPORT void UpdateDeviceList();
 
 // Get the EventType from a native event.
-UI_EXPORT EventType EventTypeFromNative(const base::NativeEvent& native_event);
+EVENTS_EXPORT EventType EventTypeFromNative(
+    const base::NativeEvent& native_event);
 
 // Get the EventFlags from a native event.
-UI_EXPORT int EventFlagsFromNative(const base::NativeEvent& native_event);
+EVENTS_EXPORT int EventFlagsFromNative(const base::NativeEvent& native_event);
 
 // Get the timestamp from a native event.
-UI_EXPORT base::TimeDelta EventTimeFromNative(
+EVENTS_EXPORT base::TimeDelta EventTimeFromNative(
     const base::NativeEvent& native_event);
 
 // Create a timestamp based on the current time.
-UI_EXPORT base::TimeDelta EventTimeForNow();
+EVENTS_EXPORT base::TimeDelta EventTimeForNow();
 
 // Get the location from a native event.  The coordinate system of the resultant
 // |Point| has the origin at top-left of the "root window".  The nature of
 // this "root window" and how it maps to platform-specific drawing surfaces is
 // defined in ui/aura/root_window.* and ui/aura/root_window_host*.
-UI_EXPORT gfx::Point EventLocationFromNative(
+EVENTS_EXPORT gfx::Point EventLocationFromNative(
     const base::NativeEvent& native_event);
 
 // Gets the location in native system coordinate space.
-UI_EXPORT gfx::Point EventSystemLocationFromNative(
+EVENTS_EXPORT gfx::Point EventSystemLocationFromNative(
     const base::NativeEvent& native_event);
 
 #if defined(USE_X11)
@@ -59,43 +61,44 @@ UI_EXPORT gfx::Point EventSystemLocationFromNative(
 // does not take into account any remapping (e.g. using xmodmap), while the
 // button reported in master events do. This is a utility function to always
 // return the mapped button.
-UI_EXPORT int EventButtonFromNative(const base::NativeEvent& native_event);
+EVENTS_EXPORT int EventButtonFromNative(const base::NativeEvent& native_event);
 #endif
 
 // Returns the KeyboardCode from a native event.
-UI_EXPORT KeyboardCode KeyboardCodeFromNative(
+EVENTS_EXPORT KeyboardCode KeyboardCodeFromNative(
     const base::NativeEvent& native_event);
 
 // Returns true if the message is a mouse event.
-UI_EXPORT bool IsMouseEvent(const base::NativeEvent& native_event);
+EVENTS_EXPORT bool IsMouseEvent(const base::NativeEvent& native_event);
 
 // Returns the flags of the button that changed during a press/release.
-UI_EXPORT int GetChangedMouseButtonFlagsFromNative(
+EVENTS_EXPORT int GetChangedMouseButtonFlagsFromNative(
     const base::NativeEvent& native_event);
 
 // Gets the mouse wheel offsets from a native event.
-UI_EXPORT gfx::Vector2d GetMouseWheelOffset(
+EVENTS_EXPORT gfx::Vector2d GetMouseWheelOffset(
     const base::NativeEvent& native_event);
 
 // Gets the touch id from a native event.
-UI_EXPORT int GetTouchId(const base::NativeEvent& native_event);
+EVENTS_EXPORT int GetTouchId(const base::NativeEvent& native_event);
 
 // Clear the touch id from bookkeeping if it is a release/cancel event.
-UI_EXPORT void ClearTouchIdIfReleased(const base::NativeEvent& native_event);
+EVENTS_EXPORT void ClearTouchIdIfReleased(
+    const base::NativeEvent& native_event);
 
 // Gets the radius along the X/Y axis from a native event. Default is 1.0.
-UI_EXPORT float GetTouchRadiusX(const base::NativeEvent& native_event);
-UI_EXPORT float GetTouchRadiusY(const base::NativeEvent& native_event);
+EVENTS_EXPORT float GetTouchRadiusX(const base::NativeEvent& native_event);
+EVENTS_EXPORT float GetTouchRadiusY(const base::NativeEvent& native_event);
 
 // Gets the angle of the major axis away from the X axis. Default is 0.0.
-UI_EXPORT float GetTouchAngle(const base::NativeEvent& native_event);
+EVENTS_EXPORT float GetTouchAngle(const base::NativeEvent& native_event);
 
 // Gets the force from a native_event. Normalized to be [0, 1]. Default is 0.0.
-UI_EXPORT float GetTouchForce(const base::NativeEvent& native_event);
+EVENTS_EXPORT float GetTouchForce(const base::NativeEvent& native_event);
 
 // Gets the fling velocity from a native event. is_cancel is set to true if
 // this was a tap down, intended to stop an ongoing fling.
-UI_EXPORT bool GetFlingData(const base::NativeEvent& native_event,
+EVENTS_EXPORT bool GetFlingData(const base::NativeEvent& native_event,
                             float* vx,
                             float* vy,
                             float* vx_ordinal,
@@ -104,49 +107,49 @@ UI_EXPORT bool GetFlingData(const base::NativeEvent& native_event,
 
 // Returns whether this is a scroll event and optionally gets the amount to be
 // scrolled. |x_offset|, |y_offset| and |finger_count| can be NULL.
-UI_EXPORT bool GetScrollOffsets(const base::NativeEvent& native_event,
+EVENTS_EXPORT bool GetScrollOffsets(const base::NativeEvent& native_event,
                                 float* x_offset,
                                 float* y_offset,
                                 float* x_offset_ordinal,
                                 float* y_offset_ordinal,
                                 int* finger_count);
 
-UI_EXPORT bool GetGestureTimes(const base::NativeEvent& native_event,
+EVENTS_EXPORT bool GetGestureTimes(const base::NativeEvent& native_event,
                                double* start_time,
                                double* end_time);
 
 // Enable/disable natural scrolling for touchpads.
-UI_EXPORT void SetNaturalScroll(bool enabled);
+EVENTS_EXPORT void SetNaturalScroll(bool enabled);
 
 // In natural scrolling enabled for touchpads?
-UI_EXPORT bool IsNaturalScrollEnabled();
+EVENTS_EXPORT bool IsNaturalScrollEnabled();
 
 // Was this event generated by a touchpad device?
 // The caller is responsible for ensuring that this is a mouse/touchpad event
 // before calling this function.
-UI_EXPORT bool IsTouchpadEvent(const base::NativeEvent& event);
+EVENTS_EXPORT bool IsTouchpadEvent(const base::NativeEvent& event);
 
 // Returns true if event is noop.
-UI_EXPORT bool IsNoopEvent(const base::NativeEvent& event);
+EVENTS_EXPORT bool IsNoopEvent(const base::NativeEvent& event);
 
 // Creates and returns no-op event.
-UI_EXPORT base::NativeEvent CreateNoopEvent();
+EVENTS_EXPORT base::NativeEvent CreateNoopEvent();
 
 #if defined(OS_WIN)
-UI_EXPORT int GetModifiersFromACCEL(const ACCEL& accel);
-UI_EXPORT int GetModifiersFromKeyState();
+EVENTS_EXPORT int GetModifiersFromACCEL(const ACCEL& accel);
+EVENTS_EXPORT int GetModifiersFromKeyState();
 
 // Returns true if |message| identifies a mouse event that was generated as the
 // result of a touch event.
-UI_EXPORT bool IsMouseEventFromTouch(UINT message);
+EVENTS_EXPORT bool IsMouseEventFromTouch(UINT message);
 #endif
 
 // Returns true if default post-target handling was canceled for |event| after
 // its dispatch to its target.
-UI_EXPORT bool EventCanceledDefaultHandling(const Event& event);
+EVENTS_EXPORT bool EventCanceledDefaultHandling(const Event& event);
 
 // Registers a custom event type.
-UI_EXPORT int RegisterCustomEventType();
+EVENTS_EXPORT int RegisterCustomEventType();
 
 }  // namespace ui