| Index: mojo/services/public/cpp/input_events/input_events_type_converters.h
|
| diff --git a/mojo/services/public/cpp/input_events/input_events_type_converters.h b/mojo/services/public/cpp/input_events/input_events_type_converters.h
|
| index 64c164560499811682a506e263a0cfd123bf5da6..bbbbe10981c3b848540d3a3fbe2ac0e257b14c4e 100644
|
| --- a/mojo/services/public/cpp/input_events/input_events_type_converters.h
|
| +++ b/mojo/services/public/cpp/input_events/input_events_type_converters.h
|
| @@ -12,30 +12,29 @@
|
|
|
| namespace mojo {
|
|
|
| -template<>
|
| -class MOJO_INPUT_EVENTS_EXPORT TypeConverter<EventType, ui::EventType> {
|
| - public:
|
| - static EventType ConvertFrom(ui::EventType type);
|
| - static ui::EventType ConvertTo(EventType type);
|
| +template <>
|
| +struct MOJO_INPUT_EVENTS_EXPORT TypeConverter<EventType, ui::EventType> {
|
| + static EventType Convert(ui::EventType type);
|
| };
|
|
|
| -template<>
|
| -class MOJO_INPUT_EVENTS_EXPORT TypeConverter<EventPtr, ui::Event> {
|
| - public:
|
| - static EventPtr ConvertFrom(const ui::Event& input);
|
| +template <>
|
| +struct MOJO_INPUT_EVENTS_EXPORT TypeConverter<ui::EventType, EventType> {
|
| + static ui::EventType Convert(EventType type);
|
| };
|
|
|
| -template<>
|
| -class MOJO_INPUT_EVENTS_EXPORT TypeConverter<EventPtr, ui::KeyEvent> {
|
| - public:
|
| - static EventPtr ConvertFrom(const ui::KeyEvent& input);
|
| +template <>
|
| +struct MOJO_INPUT_EVENTS_EXPORT TypeConverter<EventPtr, ui::Event> {
|
| + static EventPtr Convert(const ui::Event& input);
|
| };
|
|
|
| -template<>
|
| -class MOJO_INPUT_EVENTS_EXPORT TypeConverter<EventPtr,
|
| - scoped_ptr<ui::Event> > {
|
| - public:
|
| - static scoped_ptr<ui::Event> ConvertTo(const EventPtr& input);
|
| +template <>
|
| +struct MOJO_INPUT_EVENTS_EXPORT TypeConverter<EventPtr, ui::KeyEvent> {
|
| + static EventPtr Convert(const ui::KeyEvent& input);
|
| +};
|
| +
|
| +template <>
|
| +struct MOJO_INPUT_EVENTS_EXPORT TypeConverter<scoped_ptr<ui::Event>, EventPtr> {
|
| + static scoped_ptr<ui::Event> Convert(const EventPtr& input);
|
| };
|
|
|
| } // namespace mojo
|
|
|