| Index: ui/views/widget/desktop_aura/desktop_native_cursor_manager.h
|
| diff --git a/ui/views/widget/desktop_aura/desktop_native_cursor_manager.h b/ui/views/widget/desktop_aura/desktop_native_cursor_manager.h
|
| index 8dbfcfb0748cca60dc9e4c29caefef8d45a89013..07e20470730014c917102886664d28fbb2342741 100644
|
| --- a/ui/views/widget/desktop_aura/desktop_native_cursor_manager.h
|
| +++ b/ui/views/widget/desktop_aura/desktop_native_cursor_manager.h
|
| @@ -35,7 +35,7 @@ class VIEWS_EXPORT DesktopNativeCursorManager
|
| public:
|
| DesktopNativeCursorManager(
|
| scoped_ptr<DesktopCursorLoaderUpdater> cursor_loader_updater);
|
| - virtual ~DesktopNativeCursorManager();
|
| + ~DesktopNativeCursorManager() override;
|
|
|
| // Builds a cursor and sets the internal platform representation.
|
| gfx::NativeCursor GetInitializedCursor(int type);
|
| @@ -48,19 +48,15 @@ class VIEWS_EXPORT DesktopNativeCursorManager
|
|
|
| private:
|
| // 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;
|
|
|
|
|