Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(12)

Side by Side Diff: ui/events/ozone/evdev/event_converter_test_util.cc

Issue 858333006: [PATCH 9.6/11] ozone: evdev: Remove extra PostTask during dispatch from EventFactoryEvdev (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/events/ozone/evdev/event_converter_test_util.h" 5 #include "ui/events/ozone/evdev/event_converter_test_util.h"
6 6
7 #include "ui/events/ozone/device/device_manager.h" 7 #include "ui/events/ozone/device/device_manager.h"
8 #include "ui/events/ozone/evdev/device_event_dispatcher_evdev.h" 8 #include "ui/events/ozone/evdev/device_event_dispatcher_evdev.h"
9 #include "ui/events/ozone/evdev/event_factory_evdev.h" 9 #include "ui/events/ozone/evdev/event_factory_evdev.h"
10 #include "ui/events/platform/platform_event_dispatcher.h"
10 11
11 namespace ui { 12 namespace ui {
12 13
13 namespace { 14 namespace {
14 15
15 class TestDeviceManager : public ui::DeviceManager { 16 class TestDeviceManager : public ui::DeviceManager {
16 public: 17 public:
17 TestDeviceManager() {} 18 TestDeviceManager() {}
18 ~TestDeviceManager() override {} 19 ~TestDeviceManager() override {}
19 20
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 public: 88 public:
88 TestEventFactoryEvdev(CursorDelegateEvdev* cursor, 89 TestEventFactoryEvdev(CursorDelegateEvdev* cursor,
89 DeviceManager* device_manager, 90 DeviceManager* device_manager,
90 KeyboardLayoutEngine* keyboard_layout_engine, 91 KeyboardLayoutEngine* keyboard_layout_engine,
91 const EventDispatchCallback& callback) 92 const EventDispatchCallback& callback)
92 : EventFactoryEvdev(cursor, device_manager, keyboard_layout_engine), 93 : EventFactoryEvdev(cursor, device_manager, keyboard_layout_engine),
93 callback_(callback) {} 94 callback_(callback) {}
94 ~TestEventFactoryEvdev() override {} 95 ~TestEventFactoryEvdev() override {}
95 96
96 private: 97 private:
97 void PostUiEvent(scoped_ptr<Event> event) override { 98 uint32_t DispatchEvent(PlatformEvent platform_event) override {
98 callback_.Run(event.Pass()); 99 Event* event = static_cast<Event*>(platform_event);
100 callback_.Run(event);
101 return POST_DISPATCH_NONE;
99 } 102 }
100 103
101 EventDispatchCallback callback_; 104 EventDispatchCallback callback_;
102 }; 105 };
103 106
104 } // namespace 107 } // namespace
105 108
106 scoped_ptr<DeviceEventDispatcherEvdev> CreateDeviceEventDispatcherEvdevForTest( 109 scoped_ptr<DeviceEventDispatcherEvdev> CreateDeviceEventDispatcherEvdevForTest(
107 EventFactoryEvdev* event_factory) { 110 EventFactoryEvdev* event_factory) {
108 return make_scoped_ptr(new TestDeviceEventDispatcherEvdev(event_factory)); 111 return make_scoped_ptr(new TestDeviceEventDispatcherEvdev(event_factory));
109 } 112 }
110 113
111 scoped_ptr<DeviceManager> CreateDeviceManagerForTest() { 114 scoped_ptr<DeviceManager> CreateDeviceManagerForTest() {
112 return make_scoped_ptr(new TestDeviceManager()); 115 return make_scoped_ptr(new TestDeviceManager());
113 } 116 }
114 117
115 scoped_ptr<EventFactoryEvdev> CreateEventFactoryEvdevForTest( 118 scoped_ptr<EventFactoryEvdev> CreateEventFactoryEvdevForTest(
116 CursorDelegateEvdev* cursor, 119 CursorDelegateEvdev* cursor,
117 DeviceManager* device_manager, 120 DeviceManager* device_manager,
118 KeyboardLayoutEngine* keyboard_layout_engine, 121 KeyboardLayoutEngine* keyboard_layout_engine,
119 const EventDispatchCallback& callback) { 122 const EventDispatchCallback& callback) {
120 return make_scoped_ptr(new TestEventFactoryEvdev( 123 return make_scoped_ptr(new TestEventFactoryEvdev(
121 cursor, device_manager, keyboard_layout_engine, callback)); 124 cursor, device_manager, keyboard_layout_engine, callback));
122 } 125 }
123 126
124 } // namespace ui 127 } // namespace ui
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698