summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ui/aura/root_window_host_ozone.h2
-rw-r--r--ui/events/ozone/OWNERS1
-rw-r--r--ui/events/ozone/evdev/key_event_converter_ozone.cc (renamed from ui/base/ozone/evdev/key_event_converter_ozone.cc)2
-rw-r--r--ui/events/ozone/evdev/key_event_converter_ozone.h (renamed from ui/base/ozone/evdev/key_event_converter_ozone.h)9
-rw-r--r--ui/events/ozone/evdev/touch_event_converter_ozone.cc (renamed from ui/base/ozone/evdev/touch_event_converter_ozone.cc)2
-rw-r--r--ui/events/ozone/evdev/touch_event_converter_ozone.h (renamed from ui/base/ozone/evdev/touch_event_converter_ozone.h)11
-rw-r--r--ui/events/ozone/evdev/touch_event_converter_ozone_unittest.cc (renamed from ui/base/ozone/evdev/touch_event_converter_ozone_unittest.cc)2
-rw-r--r--ui/events/ozone/event_converter_ozone.cc (renamed from ui/base/ozone/event_converter_ozone.cc)2
-rw-r--r--ui/events/ozone/event_converter_ozone.h (renamed from ui/base/ozone/event_converter_ozone.h)6
-rw-r--r--ui/events/ozone/event_factory_delegate_ozone.h (renamed from ui/base/ozone/event_factory_delegate_ozone.h)6
-rw-r--r--ui/events/ozone/event_factory_ozone.cc (renamed from ui/base/ozone/event_factory_ozone.cc)8
-rw-r--r--ui/events/ozone/event_factory_ozone.h (renamed from ui/base/ozone/event_factory_ozone.h)10
-rw-r--r--ui/events/ozone/events_ozone.cc (renamed from ui/base/ozone/events_ozone.cc)0
-rw-r--r--ui/ui.gyp20
-rw-r--r--ui/ui_unittests.gypi2
15 files changed, 43 insertions, 40 deletions
diff --git a/ui/aura/root_window_host_ozone.h b/ui/aura/root_window_host_ozone.h
index f510d41..8be9e48 100644
--- a/ui/aura/root_window_host_ozone.h
+++ b/ui/aura/root_window_host_ozone.h
@@ -10,7 +10,7 @@
#include "base/memory/scoped_ptr.h"
#include "base/message_loop/message_loop.h"
#include "ui/aura/root_window_host.h"
-#include "ui/base/ozone/event_factory_ozone.h"
+#include "ui/events/ozone/event_factory_ozone.h"
#include "ui/gfx/rect.h"
namespace aura {
diff --git a/ui/events/ozone/OWNERS b/ui/events/ozone/OWNERS
new file mode 100644
index 0000000..77f21b5
--- /dev/null
+++ b/ui/events/ozone/OWNERS
@@ -0,0 +1 @@
+rjkroege@chromium.org
diff --git a/ui/base/ozone/evdev/key_event_converter_ozone.cc b/ui/events/ozone/evdev/key_event_converter_ozone.cc
index 66ec892..dc949d9 100644
--- a/ui/base/ozone/evdev/key_event_converter_ozone.cc
+++ b/ui/events/ozone/evdev/key_event_converter_ozone.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ui/base/ozone/evdev/key_event_converter_ozone.h"
+#include "ui/events/ozone/evdev/key_event_converter_ozone.h"
#include <linux/input.h>
diff --git a/ui/base/ozone/evdev/key_event_converter_ozone.h b/ui/events/ozone/evdev/key_event_converter_ozone.h
index 2ce3c22..2fdcb63 100644
--- a/ui/base/ozone/evdev/key_event_converter_ozone.h
+++ b/ui/events/ozone/evdev/key_event_converter_ozone.h
@@ -2,10 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef UI_BASE_OZONE_EVDEV_KEY_EVENT_CONVERTER_OZONE_H_
-#define UI_BASE_OZONE_EVDEV_KEY_EVENT_CONVERTER_OZONE_H_
+#ifndef UI_EVENTS_OZONE_EVDEV_KEY_EVENT_CONVERTER_OZONE_H_
+#define UI_EVENTS_OZONE_EVDEV_KEY_EVENT_CONVERTER_OZONE_H_
-#include "ui/base/ozone/event_converter_ozone.h"
+#include "ui/events/ozone/event_converter_ozone.h"
namespace ui {
@@ -24,4 +24,5 @@ class KeyEventConverterOzone : public EventConverterOzone {
} // namspace ui
-#endif // UI_BASE_OZONE_EVDEV_KEY_EVENT_CONVERTER_OZONE_H_
+#endif // UI_EVENTS_OZONE_EVDEV_KEY_EVENT_CONVERTER_OZONE_H_
+
diff --git a/ui/base/ozone/evdev/touch_event_converter_ozone.cc b/ui/events/ozone/evdev/touch_event_converter_ozone.cc
index e34adcd..9280b80 100644
--- a/ui/base/ozone/evdev/touch_event_converter_ozone.cc
+++ b/ui/events/ozone/evdev/touch_event_converter_ozone.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ui/base/ozone/evdev/touch_event_converter_ozone.h"
+#include "ui/events/ozone/evdev/touch_event_converter_ozone.h"
#include <fcntl.h>
#include <linux/input.h>
diff --git a/ui/base/ozone/evdev/touch_event_converter_ozone.h b/ui/events/ozone/evdev/touch_event_converter_ozone.h
index 62f1bfe..730bfaf 100644
--- a/ui/base/ozone/evdev/touch_event_converter_ozone.h
+++ b/ui/events/ozone/evdev/touch_event_converter_ozone.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_BASE_OZONE_EVDEV_TOUCH_EVENT_CONVERTER_OZONE_H_
-#define UI_BASE_OZONE_EVDEV_TOUCH_EVENT_CONVERTER_OZONE_H_
+#ifndef UI_EVENTS_OZONE_EVDEV_TOUCH_EVENT_CONVERTER_OZONE_H_
+#define UI_EVENTS_OZONE_EVDEV_TOUCH_EVENT_CONVERTER_OZONE_H_
#include <bitset>
#include "base/compiler_specific.h"
-#include "ui/base/ozone/event_converter_ozone.h"
-#include "ui/base/ui_export.h"
#include "ui/events/event_constants.h"
+#include "ui/events/events_export.h"
+#include "ui/events/ozone/event_converter_ozone.h"
namespace ui {
@@ -78,4 +78,5 @@ class UI_EXPORT TouchEventConverterOzone : public EventConverterOzone {
} // namespace ui
-#endif // UI_BASE_OZONE_EVDEV_TOUCH_EVENT_CONVERTER_OZONE_H_
+#endif // UI_EVENTS_OZONE_EVDEV_TOUCH_EVENT_CONVERTER_OZONE_H_
+
diff --git a/ui/base/ozone/evdev/touch_event_converter_ozone_unittest.cc b/ui/events/ozone/evdev/touch_event_converter_ozone_unittest.cc
index b75741d..709b5c1 100644
--- a/ui/base/ozone/evdev/touch_event_converter_ozone_unittest.cc
+++ b/ui/events/ozone/evdev/touch_event_converter_ozone_unittest.cc
@@ -16,8 +16,8 @@
#include "base/run_loop.h"
#include "base/time/time.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include "ui/base/ozone/evdev/touch_event_converter_ozone.h"
#include "ui/events/event.h"
+#include "ui/events/ozone/evdev/touch_event_converter_ozone.h"
namespace {
diff --git a/ui/base/ozone/event_converter_ozone.cc b/ui/events/ozone/event_converter_ozone.cc
index 95d52f8..2bb6164 100644
--- a/ui/base/ozone/event_converter_ozone.cc
+++ b/ui/events/ozone/event_converter_ozone.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ui/base/ozone/event_converter_ozone.h"
+#include "ui/events/ozone/event_converter_ozone.h"
#include "base/bind.h"
#include "base/message_loop/message_loop.h"
diff --git a/ui/base/ozone/event_converter_ozone.h b/ui/events/ozone/event_converter_ozone.h
index 58db836..b28df34 100644
--- a/ui/base/ozone/event_converter_ozone.h
+++ b/ui/events/ozone/event_converter_ozone.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef UI_BASE_OZONE_EVENT_CONVERTER_OZONE_H_
-#define UI_BASE_OZONE_EVENT_CONVERTER_OZONE_H_
+#ifndef UI_EVENTS_OZONE_EVENT_CONVERTER_OZONE_H_
+#define UI_EVENTS_OZONE_EVENT_CONVERTER_OZONE_H_
#include "base/memory/scoped_ptr.h"
#include "base/message_loop/message_pump_libevent.h"
@@ -35,4 +35,4 @@ class EventConverterOzone : public base::MessagePumpLibevent::Watcher {
} // namespace ui
-#endif // UI_BASE_OZONE_EVENT_CONVERTER_OZONE_H_
+#endif // UI_EVENTS_OZONE_EVENT_CONVERTER_OZONE_H_
diff --git a/ui/base/ozone/event_factory_delegate_ozone.h b/ui/events/ozone/event_factory_delegate_ozone.h
index 04d427d..e16adc8 100644
--- a/ui/base/ozone/event_factory_delegate_ozone.h
+++ b/ui/events/ozone/event_factory_delegate_ozone.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef UI_BASE_OZONE_EVENT_FACTORY_DELEGATE_OZONE_H_
-#define UI_BASE_OZONE_EVENT_FACTORY_DELEGATE_OZONE_H_
+#ifndef UI_EVENTS_OZONE_EVENT_FACTORY_DELEGATE_OZONE_H_
+#define UI_EVENTS_OZONE_EVENT_FACTORY_DELEGATE_OZONE_H_
namespace ui {
class Event;
@@ -26,4 +26,4 @@ class UI_EXPORT EventFactoryDelegateOzone {
} // namespace ui
-#endif // UI_BASE_OZONE_EVENT_FACTORY_DELEGATE_OZONE_H_
+#endif // UI_EVENTS_OZONE_EVENT_FACTORY_DELEGATE_OZONE_H_
diff --git a/ui/base/ozone/event_factory_ozone.cc b/ui/events/ozone/event_factory_ozone.cc
index d008047..acdf995 100644
--- a/ui/base/ozone/event_factory_ozone.cc
+++ b/ui/events/ozone/event_factory_ozone.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ui/base/ozone/event_factory_ozone.h"
+#include "ui/events/ozone/event_factory_ozone.h"
#include <errno.h>
#include <fcntl.h>
@@ -13,9 +13,9 @@
#include "base/message_loop/message_pump_ozone.h"
#include "base/stl_util.h"
#include "base/strings/stringprintf.h"
-#include "ui/base/ozone/evdev/key_event_converter_ozone.h"
-#include "ui/base/ozone/evdev/touch_event_converter_ozone.h"
-#include "ui/base/ozone/event_factory_delegate_ozone.h"
+#include "ui/events/ozone/evdev/key_event_converter_ozone.h"
+#include "ui/events/ozone/evdev/touch_event_converter_ozone.h"
+#include "ui/events/ozone/event_factory_delegate_ozone.h"
namespace ui {
diff --git a/ui/base/ozone/event_factory_ozone.h b/ui/events/ozone/event_factory_ozone.h
index b88654e..489d4ae 100644
--- a/ui/base/ozone/event_factory_ozone.h
+++ b/ui/events/ozone/event_factory_ozone.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_BASE_OZONE_EVENT_FACTORY_OZONE_H_
-#define UI_BASE_OZONE_EVENT_FACTORY_OZONE_H_
+#ifndef UI_EVENTS_OZONE_EVENT_FACTORY_OZONE_H_
+#define UI_EVENTS_OZONE_EVENT_FACTORY_OZONE_H_
#include <map>
#include "base/memory/scoped_ptr.h"
#include "base/message_loop/message_pump_libevent.h"
-#include "ui/base/ozone/event_converter_ozone.h"
-#include "ui/base/ui_export.h"
+#include "ui/events/events_export.h"
+#include "ui/events/ozone/event_converter_ozone.h"
namespace ui {
@@ -57,4 +57,4 @@ class UI_EXPORT EventFactoryOzone {
} // namespace ui
-#endif // UI_BASE_OZONE_EVENT_FACTORY_OZONE_H_
+#endif // UI_EVENTS_OZONE_EVENT_FACTORY_OZONE_H_
diff --git a/ui/base/ozone/events_ozone.cc b/ui/events/ozone/events_ozone.cc
index 0db40f4..0db40f4 100644
--- a/ui/base/ozone/events_ozone.cc
+++ b/ui/events/ozone/events_ozone.cc
diff --git a/ui/ui.gyp b/ui/ui.gyp
index d4fb269..9084640 100644
--- a/ui/ui.gyp
+++ b/ui/ui.gyp
@@ -245,16 +245,6 @@
'base/models/tree_model.h',
'base/models/tree_node_iterator.h',
'base/models/tree_node_model.h',
- 'base/ozone/evdev/key_event_converter_ozone.cc',
- 'base/ozone/evdev/key_event_converter_ozone.h',
- 'base/ozone/evdev/touch_event_converter_ozone.cc',
- 'base/ozone/evdev/touch_event_converter_ozone.h',
- 'base/ozone/event_converter_ozone.cc',
- 'base/ozone/event_converter_ozone.h',
- 'base/ozone/event_factory_delegate_ozone.h',
- 'base/ozone/event_factory_ozone.cc',
- 'base/ozone/event_factory_ozone.h',
- 'base/ozone/events_ozone.cc',
'base/ozone/surface_factory_ozone.cc',
'base/ozone/surface_factory_ozone.h',
'base/resource/data_pack.cc',
@@ -379,6 +369,16 @@
'events/keycodes/keyboard_codes.h',
'events/latency_info.cc',
'events/latency_info.h',
+ 'events/ozone/evdev/key_event_converter_ozone.cc',
+ 'events/ozone/evdev/key_event_converter_ozone.h',
+ 'events/ozone/evdev/touch_event_converter_ozone.cc',
+ 'events/ozone/evdev/touch_event_converter_ozone.h',
+ 'events/ozone/event_converter_ozone.cc',
+ 'events/ozone/event_converter_ozone.h',
+ 'events/ozone/event_factory_delegate_ozone.h',
+ 'events/ozone/event_factory_ozone.cc',
+ 'events/ozone/event_factory_ozone.h',
+ 'events/ozone/events_ozone.cc',
'gfx/android/device_display_info.cc',
'gfx/android/device_display_info.h',
'gfx/android/java_bitmap.cc',
diff --git a/ui/ui_unittests.gypi b/ui/ui_unittests.gypi
index a64bd88..ac73bfe 100644
--- a/ui/ui_unittests.gypi
+++ b/ui/ui_unittests.gypi
@@ -160,7 +160,6 @@
'base/models/list_model_unittest.cc',
'base/models/list_selection_model_unittest.cc',
'base/models/tree_node_model_unittest.cc',
- 'base/ozone/evdev/touch_event_converter_ozone_unittest.cc',
'base/sequential_id_generator_unittest.cc',
'base/test/data/resource.h',
'base/text/bytes_formatting_unittest.cc',
@@ -168,6 +167,7 @@
'events/event_dispatcher_unittest.cc',
'events/event_unittest.cc',
'events/latency_info_unittest.cc',
+ 'events/ozone/evdev/touch_event_converter_ozone_unittest.cc',
'gfx/blit_unittest.cc',
'gfx/break_list_unittest.cc',
'gfx/canvas_unittest.cc',
generated by cgit v1.1 at 2025-01-14 13:26:28 +0000