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

Unified Diff: ui/events/test/events_test_utils_x11.cc

Issue 1147293002: Stop dispatching mouse move events for wheel scrolling in X11. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address sadrul's comments. Created 5 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/events/test/events_test_utils_x11.h ('k') | ui/events/x/events_x.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/events/test/events_test_utils_x11.cc
diff --git a/ui/events/test/events_test_utils_x11.cc b/ui/events/test/events_test_utils_x11.cc
index 36faa37f892d643effaafd5ac585363d18659e63..921d75559feae73ec6dd5d1deae47fc73ef28895 100644
--- a/ui/events/test/events_test_utils_x11.cc
+++ b/ui/events/test/events_test_utils_x11.cc
@@ -291,13 +291,22 @@ void SetUpTouchPadForTest(int deviceid) {
TouchFactory::GetInstance()->SetPointerDeviceForTest(device_list);
ui::DeviceDataManagerX11* manager = ui::DeviceDataManagerX11::GetInstance();
- manager->SetDeviceListForTest(std::vector<int>(), device_list);
+ manager->SetDeviceListForTest(std::vector<int>(), device_list,
+ std::vector<int>());
}
void SetUpTouchDevicesForTest(const std::vector<int>& devices) {
TouchFactory::GetInstance()->SetTouchDeviceForTest(devices);
ui::DeviceDataManagerX11* manager = ui::DeviceDataManagerX11::GetInstance();
- manager->SetDeviceListForTest(devices, std::vector<int>());
+ manager->SetDeviceListForTest(devices, std::vector<int>(),
+ std::vector<int>());
+}
+
+void SetUpPointerDevicesForTest(const std::vector<int>& devices) {
+ TouchFactory::GetInstance()->SetPointerDeviceForTest(devices);
+ ui::DeviceDataManagerX11* manager = ui::DeviceDataManagerX11::GetInstance();
+ manager->SetDeviceListForTest(std::vector<int>(), std::vector<int>(),
+ devices);
}
} // namespace ui
« no previous file with comments | « ui/events/test/events_test_utils_x11.h ('k') | ui/events/x/events_x.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698