| Index: ui/events/touchscreen_device.h
|
| diff --git a/ui/display/types/chromeos/touchscreen_device.h b/ui/events/touchscreen_device.h
|
| similarity index 61%
|
| rename from ui/display/types/chromeos/touchscreen_device.h
|
| rename to ui/events/touchscreen_device.h
|
| index ecc64527183886300a2f99c7e93a9e5b929da6fb..1cec2817ce01ee6f4d3e08e03f940552b930ef92 100644
|
| --- a/ui/display/types/chromeos/touchscreen_device.h
|
| +++ b/ui/events/touchscreen_device.h
|
| @@ -2,17 +2,17 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef UI_DISPLAY_TYPES_CHROMEOS_TOUCHSCREEN_DEVICE_H_
|
| -#define UI_DISPLAY_TYPES_CHROMEOS_TOUCHSCREEN_DEVICE_H_
|
| +#ifndef UI_EVENTS_TOUCHSCREEN_DEVICE_H_
|
| +#define UI_EVENTS_TOUCHSCREEN_DEVICE_H_
|
|
|
| -#include "ui/display/types/display_types_export.h"
|
| +#include "ui/events/events_export.h"
|
| #include "ui/gfx/geometry/size.h"
|
|
|
| namespace ui {
|
|
|
| // Represents a Touchscreen device state.
|
| -struct DISPLAY_TYPES_EXPORT TouchscreenDevice {
|
| - static const int kInvalidId;
|
| +struct EVENTS_EXPORT TouchscreenDevice {
|
| + static const int kInvalidId = 0;
|
|
|
| TouchscreenDevice(int id, const gfx::Size& size);
|
|
|
| @@ -25,4 +25,4 @@ struct DISPLAY_TYPES_EXPORT TouchscreenDevice {
|
|
|
| } // namespace ui
|
|
|
| -#endif // UI_DISPLAY_TYPES_CHROMEOS_TOUCHSCREEN_DEVICE_H_
|
| +#endif // UI_EVENTS_TOUCHSCREEN_DEVICE_H_
|
|
|