| Index: components/view_manager/event_dispatcher.h
|
| diff --git a/components/view_manager/event_dispatcher.h b/components/view_manager/event_dispatcher.h
|
| index 9716f06b492d026cdd7d8aeaf99ba55d6ecfbf86..a2d45144e04b4f25734244649ac3956e6c38fc0a 100644
|
| --- a/components/view_manager/event_dispatcher.h
|
| +++ b/components/view_manager/event_dispatcher.h
|
| @@ -8,24 +8,25 @@
|
| #include <set>
|
|
|
| #include "base/basictypes.h"
|
| -#include "components/view_manager/public/interfaces/native_viewport.mojom.h"
|
| +#include "ui/mojo/events/input_event_constants.mojom.h"
|
| +#include "ui/mojo/events/input_events.mojom.h"
|
| +#include "ui/mojo/events/input_key_codes.mojom.h"
|
|
|
| namespace view_manager {
|
|
|
| class ConnectionManager;
|
|
|
| // Handles dispatching events to the right location as well as updating focus.
|
| -class EventDispatcher : public mojo::NativeViewportEventDispatcher {
|
| +class EventDispatcher {
|
| public:
|
| explicit EventDispatcher(ConnectionManager* connection_manager);
|
| - ~EventDispatcher() override;
|
| + ~EventDispatcher();
|
|
|
| void AddAccelerator(mojo::KeyboardCode keyboard_code, mojo::EventFlags flags);
|
| void RemoveAccelerator(mojo::KeyboardCode keyboard_code,
|
| mojo::EventFlags flags);
|
|
|
| - // NativeViewportEventDispatcher:
|
| - void OnEvent(mojo::EventPtr event, const OnEventCallback& callback) override;
|
| + void OnEvent(mojo::EventPtr event);
|
|
|
| private:
|
| struct Accelerator {
|
|
|