diff options
Diffstat (limited to 'chromium/components/exo/wm_helper_mus.h')
| -rw-r--r-- | chromium/components/exo/wm_helper_mus.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/chromium/components/exo/wm_helper_mus.h b/chromium/components/exo/wm_helper_mus.h index 6fda7388396..820db7a929c 100644 --- a/chromium/components/exo/wm_helper_mus.h +++ b/chromium/components/exo/wm_helper_mus.h @@ -11,11 +11,9 @@ #include "ui/aura/mus/focus_synchronizer_observer.h" #include "ui/events/devices/input_device_event_observer.h" -namespace aura { -namespace client { +namespace wm { class ActivationClient; } -} namespace exo { @@ -35,14 +33,14 @@ class WMHelperMus : public WMHelper, aura::Window* GetPrimaryDisplayContainer(int container_id) override; aura::Window* GetActiveWindow() const override; aura::Window* GetFocusedWindow() const override; - ui::CursorSetType GetCursorSet() const override; + ui::CursorSize GetCursorSize() const override; const display::Display& GetCursorDisplay() const override; void AddPreTargetHandler(ui::EventHandler* handler) override; void PrependPreTargetHandler(ui::EventHandler* handler) override; void RemovePreTargetHandler(ui::EventHandler* handler) override; void AddPostTargetHandler(ui::EventHandler* handler) override; void RemovePostTargetHandler(ui::EventHandler* handler) override; - bool IsMaximizeModeWindowManagerEnabled() const override; + bool IsTabletModeWindowManagerEnabled() const override; // Overridden from aura::FocusSynchronizerObserver: void OnActiveFocusClientChanged(aura::client::FocusClient* focus_client, @@ -61,7 +59,7 @@ class WMHelperMus : public WMHelper, void SetActiveWindow(aura::Window* window); void SetFocusedWindow(aura::Window* window); - aura::client::ActivationClient* GetActivationClient(); + wm::ActivationClient* GetActivationClient(); // Current FocusClient. aura::client::FocusClient* active_focus_client_ = nullptr; |