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

Unified Diff: ui/events/touchscreen_device.h

Issue 618283003: Adds special support to the device manager for keyboards devices. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Do not run x11 test on non-x11 platforms. Created 6 years, 2 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
Index: ui/events/touchscreen_device.h
diff --git a/ui/events/touchscreen_device.h b/ui/events/touchscreen_device.h
index 669f3061f3374a7962d1d768012e26be1783f833..d281a0b8fe6717ae396b2fbbd2797e9635da44ae 100644
--- a/ui/events/touchscreen_device.h
+++ b/ui/events/touchscreen_device.h
@@ -5,25 +5,23 @@
#ifndef UI_EVENTS_TOUCHSCREEN_DEVICE_H_
#define UI_EVENTS_TOUCHSCREEN_DEVICE_H_
+#include <string>
+
#include "ui/events/events_base_export.h"
+#include "ui/events/input_device.h"
#include "ui/gfx/geometry/size.h"
namespace ui {
// Represents a Touchscreen device state.
-struct EVENTS_BASE_EXPORT TouchscreenDevice {
- static const int kInvalidId;
-
- TouchscreenDevice(int id, const gfx::Size& size, bool is_internal);
-
- // ID of the touch screen. This ID must uniquely identify the touch screen.
- int id;
+struct EVENTS_BASE_EXPORT TouchscreenDevice : public InputDevice {
+ TouchscreenDevice(int id,
+ InputDeviceType type,
+ const std::string& name,
+ const gfx::Size& size);
// Size of the touch screen area.
gfx::Size size;
-
- // True if this is an internal touchscreen.
- bool is_internal;
};
} // namespace ui

Powered by Google App Engine
This is Rietveld 408576698