| Index: services/ui/ws/display.h
|
| diff --git a/services/ui/ws/display.h b/services/ui/ws/display.h
|
| index 679a338fab81a596d4d1ccd6e1576c685c2ea6aa..a86d795d45fff071eb8bca4bdabbd4234acc1d52 100644
|
| --- a/services/ui/ws/display.h
|
| +++ b/services/ui/ws/display.h
|
| @@ -27,6 +27,7 @@
|
| #include "services/ui/ws/user_id_tracker_observer.h"
|
| #include "services/ui/ws/window_manager_window_tree_factory_set_observer.h"
|
| #include "ui/display/display.h"
|
| +#include "ui/events/event_processor.h"
|
|
|
| namespace ui {
|
| namespace ws {
|
| @@ -52,7 +53,8 @@ class DisplayTestApi;
|
| // Display.
|
| // . without a DisplayBinding. In this mode a WindowManager is automatically
|
| // created per user.
|
| -class Display : public PlatformDisplayDelegate,
|
| +class Display : public ui::EventProcessor,
|
| + public PlatformDisplayDelegate,
|
| public mojom::WindowTreeHost,
|
| public FocusControllerObserver,
|
| public FocusControllerDelegate,
|
| @@ -166,12 +168,18 @@ class Display : public PlatformDisplayDelegate,
|
| // pixels.
|
| void CreateRootWindow(const gfx::Size& size);
|
|
|
| + // ui::EventProcessor:
|
| + bool CanDispatchToTarget(ui::EventTarget* target) override;
|
| + ui::EventTarget* GetRootForEvent(ui::Event* event) override;
|
| + ui::EventTargeter* GetDefaultEventTargeter() override;
|
| + ui::EventDispatchDetails OnEventFromSource(ui::Event* event) override;
|
| +
|
| // PlatformDisplayDelegate:
|
| display::Display GetDisplay() override;
|
| ServerWindow* GetRootWindow() override;
|
| + ui::EventProcessor* GetEventProcessor() override;
|
| void OnAcceleratedWidgetAvailable() override;
|
| bool IsInHighContrastMode() override;
|
| - void OnEvent(const ui::Event& event) override;
|
| void OnNativeCaptureLost() override;
|
|
|
| // FocusControllerDelegate:
|
|
|