| Index: mojo/converters/input_events_type_converters.h
|
| diff --git a/mojo/services/public/cpp/input_events/input_events_type_converters.h b/mojo/converters/input_events_type_converters.h
|
| similarity index 50%
|
| rename from mojo/services/public/cpp/input_events/input_events_type_converters.h
|
| rename to mojo/converters/input_events_type_converters.h
|
| index bbbbe10981c3b848540d3a3fbe2ac0e257b14c4e..f0b75134fe527d1bcc226fdc7a64b86b4d3b5f2b 100644
|
| --- a/mojo/services/public/cpp/input_events/input_events_type_converters.h
|
| +++ b/mojo/converters/input_events_type_converters.h
|
| @@ -2,41 +2,41 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef MOJO_SERVICES_PUBLIC_CPP_INPUT_EVENTS_INPUT_EVENTS_TYPE_CONVERTERS_H_
|
| -#define MOJO_SERVICES_PUBLIC_CPP_INPUT_EVENTS_INPUT_EVENTS_TYPE_CONVERTERS_H_
|
| +#ifndef MOJO_CONVERTERS_INPUT_EVENTS_TYPE_CONVERTERS_H_
|
| +#define MOJO_CONVERTERS_INPUT_EVENTS_TYPE_CONVERTERS_H_
|
|
|
| #include "base/memory/scoped_ptr.h"
|
| -#include "mojo/services/public/cpp/input_events/mojo_input_events_export.h"
|
| +#include "mojo/converters/mojo_converters_export.h"
|
| #include "mojo/services/public/interfaces/input_events/input_events.mojom.h"
|
| #include "ui/events/event.h"
|
|
|
| namespace mojo {
|
|
|
| template <>
|
| -struct MOJO_INPUT_EVENTS_EXPORT TypeConverter<EventType, ui::EventType> {
|
| +struct MOJO_CONVERTERS_EXPORT TypeConverter<EventType, ui::EventType> {
|
| static EventType Convert(ui::EventType type);
|
| };
|
|
|
| template <>
|
| -struct MOJO_INPUT_EVENTS_EXPORT TypeConverter<ui::EventType, EventType> {
|
| +struct MOJO_CONVERTERS_EXPORT TypeConverter<ui::EventType, EventType> {
|
| static ui::EventType Convert(EventType type);
|
| };
|
|
|
| template <>
|
| -struct MOJO_INPUT_EVENTS_EXPORT TypeConverter<EventPtr, ui::Event> {
|
| +struct MOJO_CONVERTERS_EXPORT TypeConverter<EventPtr, ui::Event> {
|
| static EventPtr Convert(const ui::Event& input);
|
| };
|
|
|
| template <>
|
| -struct MOJO_INPUT_EVENTS_EXPORT TypeConverter<EventPtr, ui::KeyEvent> {
|
| +struct MOJO_CONVERTERS_EXPORT TypeConverter<EventPtr, ui::KeyEvent> {
|
| static EventPtr Convert(const ui::KeyEvent& input);
|
| };
|
|
|
| template <>
|
| -struct MOJO_INPUT_EVENTS_EXPORT TypeConverter<scoped_ptr<ui::Event>, EventPtr> {
|
| +struct MOJO_CONVERTERS_EXPORT TypeConverter<scoped_ptr<ui::Event>, EventPtr> {
|
| static scoped_ptr<ui::Event> Convert(const EventPtr& input);
|
| };
|
|
|
| } // namespace mojo
|
|
|
| -#endif // MOJO_SERVICES_PUBLIC_CPP_INPUT_EVENTS_INPUT_EVENTS_TYPE_CONVERTERS_H_
|
| +#endif // MOJO_CONVERTERS_INPUT_EVENTS_TYPE_CONVERTERS_H_
|
|
|