| Index: ui/events/touchscreen_device.cc
|
| diff --git a/ui/events/touchscreen_device.cc b/ui/events/touchscreen_device.cc
|
| index 07844a152c788f362437ee13e3d21496e4efd78c..58c2370d601271a7fba6e868109b45073c9f7410 100644
|
| --- a/ui/events/touchscreen_device.cc
|
| +++ b/ui/events/touchscreen_device.cc
|
| @@ -4,15 +4,17 @@
|
|
|
| #include "ui/events/touchscreen_device.h"
|
|
|
| -namespace ui {
|
| +#include <string>
|
| +
|
| +#include "ui/events/input_device.h"
|
|
|
| -// static
|
| -const int TouchscreenDevice::kInvalidId = 0;
|
| +namespace ui {
|
|
|
| TouchscreenDevice::TouchscreenDevice(int id,
|
| - const gfx::Size& size,
|
| - bool is_internal)
|
| - : id(id), size(size), is_internal(is_internal) {
|
| + InputDeviceType type,
|
| + const std::string& name,
|
| + const gfx::Size& size)
|
| + : InputDevice(id, type, name), size(size) {
|
| }
|
|
|
| } // namespace ui
|
|
|