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

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: rebase 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 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 public: 80 public:
80 TestEventFactoryEvdev(CursorDelegateEvdev* cursor, 81 TestEventFactoryEvdev(CursorDelegateEvdev* cursor,
81 DeviceManager* device_manager, 82 DeviceManager* device_manager,
82 KeyboardLayoutEngine* keyboard_layout_engine, 83 KeyboardLayoutEngine* keyboard_layout_engine,
83 const EventDispatchCallback& callback) 84 const EventDispatchCallback& callback)
84 : EventFactoryEvdev(cursor, device_manager, keyboard_layout_engine), 85 : EventFactoryEvdev(cursor, device_manager, keyboard_layout_engine),
85 callback_(callback) {} 86 callback_(callback) {}
86 ~TestEventFactoryEvdev() override {} 87 ~TestEventFactoryEvdev() override {}
87 88
88 private: 89 private:
89 void PostUiEvent(scoped_ptr<Event> event) override { 90 uint32_t DispatchEvent(PlatformEvent platform_event) override {
90 callback_.Run(event.Pass()); 91 Event* event = static_cast<Event*>(platform_event);
92 callback_.Run(event);
93 return POST_DISPATCH_NONE;
91 } 94 }
92 95
93 EventDispatchCallback callback_; 96 EventDispatchCallback callback_;
94 }; 97 };
95 98
96 } // namespace 99 } // namespace
97 100
98 scoped_ptr<DeviceEventDispatcherEvdev> CreateDeviceEventDispatcherEvdevForTest( 101 scoped_ptr<DeviceEventDispatcherEvdev> CreateDeviceEventDispatcherEvdevForTest(
99 EventFactoryEvdev* event_factory) { 102 EventFactoryEvdev* event_factory) {
100 return make_scoped_ptr(new TestDeviceEventDispatcherEvdev(event_factory)); 103 return make_scoped_ptr(new TestDeviceEventDispatcherEvdev(event_factory));
101 } 104 }
102 105
103 scoped_ptr<DeviceManager> CreateDeviceManagerForTest() { 106 scoped_ptr<DeviceManager> CreateDeviceManagerForTest() {
104 return make_scoped_ptr(new TestDeviceManager()); 107 return make_scoped_ptr(new TestDeviceManager());
105 } 108 }
106 109
107 scoped_ptr<EventFactoryEvdev> CreateEventFactoryEvdevForTest( 110 scoped_ptr<EventFactoryEvdev> CreateEventFactoryEvdevForTest(
108 CursorDelegateEvdev* cursor, 111 CursorDelegateEvdev* cursor,
109 DeviceManager* device_manager, 112 DeviceManager* device_manager,
110 KeyboardLayoutEngine* keyboard_layout_engine, 113 KeyboardLayoutEngine* keyboard_layout_engine,
111 const EventDispatchCallback& callback) { 114 const EventDispatchCallback& callback) {
112 return make_scoped_ptr(new TestEventFactoryEvdev( 115 return make_scoped_ptr(new TestEventFactoryEvdev(
113 cursor, device_manager, keyboard_layout_engine, callback)); 116 cursor, device_manager, keyboard_layout_engine, callback));
114 } 117 }
115 118
116 } // namespace ui 119 } // namespace ui
OLDNEW
« no previous file with comments | « ui/events/ozone/evdev/event_converter_evdev_impl_unittest.cc ('k') | ui/events/ozone/evdev/event_dispatch_callback.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698