Index: ui/wm/core/compound_event_filter.h |
diff --git a/ui/views/corewm/compound_event_filter.h b/ui/wm/core/compound_event_filter.h |
similarity index 89% |
rename from ui/views/corewm/compound_event_filter.h |
rename to ui/wm/core/compound_event_filter.h |
index 7f724c35e06afa9a8f2b581eb438ce02fa927c4d..a12e57baac11fa17542fe9fa94e080c2a654f58b 100644 |
--- a/ui/views/corewm/compound_event_filter.h |
+++ b/ui/wm/core/compound_event_filter.h |
@@ -2,15 +2,15 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#ifndef UI_VIEWS_COREWM_COMPOUND_EVENT_FILTER_H_ |
-#define UI_VIEWS_COREWM_COMPOUND_EVENT_FILTER_H_ |
+#ifndef UI_WM_CORE_COMPOUND_EVENT_FILTER_H_ |
+#define UI_WM_CORE_COMPOUND_EVENT_FILTER_H_ |
#include "base/compiler_specific.h" |
#include "base/observer_list.h" |
#include "ui/events/event.h" |
#include "ui/events/event_handler.h" |
#include "ui/gfx/native_widget_types.h" |
-#include "ui/views/views_export.h" |
+#include "ui/wm/core/wm_core_export.h" |
namespace aura { |
class CursorManager; |
@@ -28,6 +28,8 @@ class TouchEvent; |
namespace views { |
namespace corewm { |
+// TODO(beng): This class should die. AddEventHandler() on the root Window |
+// should be used instead. |
// CompoundEventFilter gets all events first and can provide actions to those |
// events. It implements global features such as click to activate a window and |
// cursor change when moving mouse. |
@@ -36,7 +38,7 @@ namespace corewm { |
// consumed by any of those filters. If an event is consumed by a filter, the |
// rest of the filter(s) and CompoundEventFilter will not see the consumed |
// event. |
-class VIEWS_EXPORT CompoundEventFilter : public ui::EventHandler { |
+class WM_CORE_EXPORT CompoundEventFilter : public ui::EventHandler { |
public: |
CompoundEventFilter(); |
virtual ~CompoundEventFilter(); |
@@ -90,4 +92,4 @@ class VIEWS_EXPORT CompoundEventFilter : public ui::EventHandler { |
} // namespace corewm |
} // namespace views |
-#endif // UI_VIEWS_COREWM_COMPOUND_EVENT_FILTER_H_ |
+#endif // UI_WM_CORE_COMPOUND_EVENT_FILTER_H_ |