| Index: ash/wm/ash_native_cursor_manager.h
|
| diff --git a/ash/wm/ash_native_cursor_manager.h b/ash/wm/ash_native_cursor_manager.h
|
| index 0ab9964bdba34e662fb875d3397d5c484f487730..0c1da8222dcbba9408cf6a52bc279e531220c3b7 100644
|
| --- a/ash/wm/ash_native_cursor_manager.h
|
| +++ b/ash/wm/ash_native_cursor_manager.h
|
| @@ -33,7 +33,7 @@ class ASH_EXPORT AshNativeCursorManager
|
| : public ::wm::NativeCursorManager {
|
| public:
|
| AshNativeCursorManager();
|
| - virtual ~AshNativeCursorManager();
|
| + ~AshNativeCursorManager() override;
|
|
|
| // Toggle native cursor enabled/disabled.
|
| // The native cursor is enabled by default. When disabled, we hide the native
|
| @@ -45,19 +45,15 @@ class ASH_EXPORT AshNativeCursorManager
|
| friend class test::CursorManagerTestApi;
|
|
|
| // Overridden from ::wm::NativeCursorManager:
|
| - virtual void SetDisplay(
|
| - const gfx::Display& display,
|
| - ::wm::NativeCursorManagerDelegate* delegate) override;
|
| - virtual void SetCursor(
|
| - gfx::NativeCursor cursor,
|
| - ::wm::NativeCursorManagerDelegate* delegate) override;
|
| - virtual void SetVisibility(
|
| - bool visible,
|
| - ::wm::NativeCursorManagerDelegate* delegate) override;
|
| - virtual void SetCursorSet(
|
| - ui::CursorSetType cursor_set,
|
| - ::wm::NativeCursorManagerDelegate* delegate) override;
|
| - virtual void SetMouseEventsEnabled(
|
| + void SetDisplay(const gfx::Display& display,
|
| + ::wm::NativeCursorManagerDelegate* delegate) override;
|
| + void SetCursor(gfx::NativeCursor cursor,
|
| + ::wm::NativeCursorManagerDelegate* delegate) override;
|
| + void SetVisibility(bool visible,
|
| + ::wm::NativeCursorManagerDelegate* delegate) override;
|
| + void SetCursorSet(ui::CursorSetType cursor_set,
|
| + ::wm::NativeCursorManagerDelegate* delegate) override;
|
| + void SetMouseEventsEnabled(
|
| bool enabled,
|
| ::wm::NativeCursorManagerDelegate* delegate) override;
|
|
|
|
|