3 files changed, 8 insertions, 24 deletions
diff --git a/ui/base/events/event_functions.h b/ui/base/events/event_functions.h
deleted file mode 100644
index 4b98eb7..0000000
--- a/ui/base/events/event_functions.h
+++ /dev/null
@@ -1,20 +0,0 @@
-// 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.
-
-#ifndef UI_BASE_EVENTS_EVENT_FUNCTIONS_H_
-#define UI_BASE_EVENTS_EVENT_FUNCTIONS_H_
-
-#include "ui/base/ui_export.h"
-
-namespace ui {
-
-class Event;
-
-// Returns true if default post-target handling was canceled for |event| after
-// its dispatch to its target.
-UI_EXPORT bool EventCanceledDefaultHandling(const ui::Event& event);
-
-}  // namespace ui
-
-#endif  // UI_BASE_EVENTS_EVENT_FUNCTIONS_H_
diff --git a/ui/base/events/event_functions.cc b/ui/base/events/event_utils.cc
index 6f71027..2d1e7af 100644
--- a/ui/base/events/event_functions.cc
+++ b/ui/base/events/event_utils.cc
@@ -2,16 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/base/events/event_functions.h"
+#include "ui/base/events/event_utils.h"
 
 #include "ui/base/events/event.h"
-#include "ui/base/events/event_constants.h"
 
 namespace ui {
 
-bool EventCanceledDefaultHandling(const ui::Event& event) {
+bool EventCanceledDefaultHandling(const Event& event) {
   return event.phase() == EP_POSTTARGET && event.result() != ER_UNHANDLED;
 }
 
 }  // namespace ui
-
diff --git a/ui/base/events/event_utils.h b/ui/base/events/event_utils.h
index 1bef563..da1d4c6 100644
--- a/ui/base/events/event_utils.h
+++ b/ui/base/events/event_utils.h
@@ -24,6 +24,8 @@ class TimeDelta;
 
 namespace ui {
 
+class Event;
+
 // Updates the list of devices for cached properties.
 UI_EXPORT void UpdateDeviceList();
 
@@ -125,6 +127,10 @@ UI_EXPORT int GetModifiersFromKeyState();
 UI_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);
+
 }  // namespace ui
 
 #endif  // UI_BASE_EVENTS_EVENT_UTILS_H_