Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / ui / events / event_utils.h

diff --git a/src/ui/events/event_utils.h b/src/ui/events/event_utils.h
index 2e98b53..e077522 100644 (file)
--- a/src/ui/events/event_utils.h
+++ b/src/ui/events/event_utils.h
@@ -8,6 +8,7 @@
 #include "base/event_types.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"
 
@@ -48,7 +49,7 @@ 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*.
+// defined in ui/aura/root_window.* and ui/aura/window_tree_host*.
 // TODO(tdresser): Return gfx::PointF here. See crbug.com/337827.
 EVENTS_EXPORT gfx::Point EventLocationFromNative(
     const base::NativeEvent& native_event);
@@ -131,17 +132,14 @@ EVENTS_EXPORT bool IsNaturalScrollEnabled();
 // Returns whether natural scrolling should be used for touchpad.
 EVENTS_EXPORT bool ShouldDefaultToNaturalScroll();
 
+// Returns whether or not the internal display produces touch events.
+EVENTS_EXPORT gfx::Display::TouchSupport GetInternalDisplayTouchSupport();
+
 // 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.
 EVENTS_EXPORT bool IsTouchpadEvent(const base::NativeEvent& event);
 
-// Returns true if event is noop.
-EVENTS_EXPORT bool IsNoopEvent(const base::NativeEvent& event);
-
-// Creates and returns no-op event.
-EVENTS_EXPORT base::NativeEvent CreateNoopEvent();
-
 #if defined(OS_WIN)
 EVENTS_EXPORT int GetModifiersFromACCEL(const ACCEL& accel);
 EVENTS_EXPORT int GetModifiersFromKeyState();