| Index: ui/events/mojo/event_struct_traits.h
|
| diff --git a/ui/events/mojo/event_struct_traits.h b/ui/events/mojo/event_struct_traits.h
|
| index 8c5925c8a4adb9844e1dbfa370c7a9dd7bf1aca6..d7b9e1c6c73b1fbf3c02ac3e0db5c53b4b150b4c 100644
|
| --- a/ui/events/mojo/event_struct_traits.h
|
| +++ b/ui/events/mojo/event_struct_traits.h
|
| @@ -2,10 +2,10 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef COMPONENTS_MUS_PUBLIC_CPP_EVENT_STRUCT_TRAITS_H_
|
| -#define COMPONENTS_MUS_PUBLIC_CPP_EVENT_STRUCT_TRAITS_H_
|
| +#ifndef UI_EVENTS_MOJO_EVENT_STRUCT_TRAITS_H_
|
| +#define UI_EVENTS_MOJO_EVENT_STRUCT_TRAITS_H_
|
|
|
| -#include "components/mus/public/interfaces/input_events.mojom.h"
|
| +#include "ui/events/mojo/event.mojom.h"
|
|
|
| namespace ui {
|
| class Event;
|
| @@ -16,15 +16,15 @@ namespace mojo {
|
| using EventUniquePtr = std::unique_ptr<ui::Event>;
|
|
|
| template <>
|
| -struct StructTraits<mus::mojom::Event, EventUniquePtr> {
|
| - static mus::mojom::EventType action(const EventUniquePtr& event);
|
| +struct StructTraits<ui::mojom::Event, EventUniquePtr> {
|
| + static ui::mojom::EventType action(const EventUniquePtr& event);
|
| static int32_t flags(const EventUniquePtr& event);
|
| static int64_t time_stamp(const EventUniquePtr& event);
|
| - static mus::mojom::KeyDataPtr key_data(const EventUniquePtr& event);
|
| - static mus::mojom::PointerDataPtr pointer_data(const EventUniquePtr& event);
|
| - static bool Read(mus::mojom::EventDataView r, EventUniquePtr* out);
|
| + static ui::mojom::KeyDataPtr key_data(const EventUniquePtr& event);
|
| + static ui::mojom::PointerDataPtr pointer_data(const EventUniquePtr& event);
|
| + static bool Read(ui::mojom::EventDataView r, EventUniquePtr* out);
|
| };
|
|
|
| -} // namespace mus
|
| +} // namespace mojo
|
|
|
| -#endif // COMPONENTS_MUS_PUBLIC_CPP_EVENT_STRUCT_TRAITS_H_
|
| +#endif // UI_EVENTS_MOJO_EVENT_STRUCT_TRAITS_H_
|
|
|