| Index: components/exo/wm_helper_ash.h
|
| diff --git a/components/exo/wm_helper_ash.h b/components/exo/wm_helper_ash.h
|
| index 52986246f25908d6542e0f8450f797f757a0cee4..a27934f8907a9c735f33ef5edb4ba000f9e891d7 100644
|
| --- a/components/exo/wm_helper_ash.h
|
| +++ b/components/exo/wm_helper_ash.h
|
| @@ -34,7 +34,7 @@ class WMHelperAsh : 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::CursorSet GetCursorSet() const override;
|
| const display::Display& GetCursorDisplay() const override;
|
| void AddPreTargetHandler(ui::EventHandler* handler) override;
|
| void PrependPreTargetHandler(ui::EventHandler* handler) override;
|
| @@ -54,7 +54,7 @@ class WMHelperAsh : public WMHelper,
|
|
|
| // Overridden from aura::client::CursorClientObserver:
|
| void OnCursorVisibilityChanged(bool is_visible) override;
|
| - void OnCursorSetChanged(ui::CursorSetType cursor_set) override;
|
| + void OnCursorSetChanged(ui::CursorSet cursor_set) override;
|
| void OnCursorDisplayChanged(const display::Display& display) override;
|
|
|
| // Overridden from ash::ShellObserver:
|
|
|