| Index: mojo/converters/input_events/input_events_type_converters.h
|
| diff --git a/mojo/converters/input_events/input_events_type_converters.h b/mojo/converters/input_events/input_events_type_converters.h
|
| index d5200063eeea32c0be74cf321f84f4f29146f8f9..b9e152f34f9c66d39ae5ff8fa513869c99a0e76e 100644
|
| --- a/mojo/converters/input_events/input_events_type_converters.h
|
| +++ b/mojo/converters/input_events/input_events_type_converters.h
|
| @@ -12,17 +12,14 @@
|
|
|
| namespace mojo {
|
|
|
| +// NOTE: the mojo input events do not necessarily provide a 1-1 mapping with
|
| +// ui::Event types. Be careful in using them!
|
| template <>
|
| struct MOJO_INPUT_EVENTS_EXPORT TypeConverter<EventType, ui::EventType> {
|
| static EventType Convert(ui::EventType type);
|
| };
|
|
|
| template <>
|
| -struct MOJO_INPUT_EVENTS_EXPORT TypeConverter<ui::EventType, EventType> {
|
| - static ui::EventType Convert(EventType type);
|
| -};
|
| -
|
| -template <>
|
| struct MOJO_INPUT_EVENTS_EXPORT TypeConverter<EventPtr, ui::Event> {
|
| static EventPtr Convert(const ui::Event& input);
|
| };
|
| @@ -33,6 +30,11 @@ struct MOJO_INPUT_EVENTS_EXPORT TypeConverter<EventPtr, ui::KeyEvent> {
|
| };
|
|
|
| template <>
|
| +struct MOJO_INPUT_EVENTS_EXPORT TypeConverter<EventPtr, ui::GestureEvent> {
|
| + static EventPtr Convert(const ui::GestureEvent& input);
|
| +};
|
| +
|
| +template <>
|
| struct MOJO_INPUT_EVENTS_EXPORT TypeConverter<scoped_ptr<ui::Event>, EventPtr> {
|
| static scoped_ptr<ui::Event> Convert(const EventPtr& input);
|
| };
|
|
|