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

Side by Side Diff: ui/events/test/events_test_utils_x11.h

Issue 1071193002: Change device IDs from unsigned to signed. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more test fixes Created 5 years, 8 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 #ifndef UI_EVENTS_TEST_EVENTS_TEST_UTILS_X11_H_ 5 #ifndef UI_EVENTS_TEST_EVENTS_TEST_UTILS_X11_H_
6 #define UI_EVENTS_TEST_EVENTS_TEST_UTILS_X11_H_ 6 #define UI_EVENTS_TEST_EVENTS_TEST_UTILS_X11_H_
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "ui/events/devices/x11/device_data_manager_x11.h" 9 #include "ui/events/devices/x11/device_data_manager_x11.h"
10 #include "ui/events/event_constants.h" 10 #include "ui/events/event_constants.h"
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 void Cleanup(); 83 void Cleanup();
84 84
85 void SetUpValuators(const std::vector<Valuator>& valuators); 85 void SetUpValuators(const std::vector<Valuator>& valuators);
86 86
87 scoped_ptr<XEvent, XEventDeleter> event_; 87 scoped_ptr<XEvent, XEventDeleter> event_;
88 88
89 DISALLOW_COPY_AND_ASSIGN(ScopedXI2Event); 89 DISALLOW_COPY_AND_ASSIGN(ScopedXI2Event);
90 }; 90 };
91 91
92 // Initializes a test touchpad device for scroll events. 92 // Initializes a test touchpad device for scroll events.
93 void SetUpTouchPadForTest(unsigned int deviceid); 93 void SetUpTouchPadForTest(int deviceid);
94 94
95 // Initializes a list of touchscreen devices for touch events. 95 // Initializes a list of touchscreen devices for touch events.
96 void SetUpTouchDevicesForTest(const std::vector<unsigned int>& devices); 96 void SetUpTouchDevicesForTest(const std::vector<int>& devices);
97 97
98 } // namespace ui 98 } // namespace ui
99 99
100 #endif // UI_EVENTS_TEST_EVENTS_TEST_UTILS_X11_H_ 100 #endif // UI_EVENTS_TEST_EVENTS_TEST_UTILS_X11_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698