| 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 b9a36ffbbfcd5ca957f8c046bbf455acf67d2bd3..7124bdc05868556e7d5b0724cf9101841cca4b33 100644
|
| --- a/ash/wm/ash_native_cursor_manager.h
|
| +++ b/ash/wm/ash_native_cursor_manager.h
|
| @@ -28,7 +28,7 @@ class ImageCursors;
|
| // NativeCursorManagerDelegate interface, which receives messages about what
|
| // changes were acted on.
|
| class ASH_EXPORT AshNativeCursorManager
|
| - : public views::corewm::NativeCursorManager {
|
| + : public ::wm::NativeCursorManager {
|
| public:
|
| AshNativeCursorManager();
|
| virtual ~AshNativeCursorManager();
|
| @@ -42,25 +42,25 @@ class ASH_EXPORT AshNativeCursorManager
|
| private:
|
| friend class test::CursorManagerTestApi;
|
|
|
| - // Overridden from views::corewm::NativeCursorManager:
|
| + // Overridden from ::wm::NativeCursorManager:
|
| virtual void SetDisplay(
|
| const gfx::Display& display,
|
| - views::corewm::NativeCursorManagerDelegate* delegate) OVERRIDE;
|
| + ::wm::NativeCursorManagerDelegate* delegate) OVERRIDE;
|
| virtual void SetCursor(
|
| gfx::NativeCursor cursor,
|
| - views::corewm::NativeCursorManagerDelegate* delegate) OVERRIDE;
|
| + ::wm::NativeCursorManagerDelegate* delegate) OVERRIDE;
|
| virtual void SetVisibility(
|
| bool visible,
|
| - views::corewm::NativeCursorManagerDelegate* delegate) OVERRIDE;
|
| + ::wm::NativeCursorManagerDelegate* delegate) OVERRIDE;
|
| virtual void SetScale(
|
| float scale,
|
| - views::corewm::NativeCursorManagerDelegate* delegate) OVERRIDE;
|
| + ::wm::NativeCursorManagerDelegate* delegate) OVERRIDE;
|
| virtual void SetCursorSet(
|
| ui::CursorSetType cursor_set,
|
| - views::corewm::NativeCursorManagerDelegate* delegate) OVERRIDE;
|
| + ::wm::NativeCursorManagerDelegate* delegate) OVERRIDE;
|
| virtual void SetMouseEventsEnabled(
|
| bool enabled,
|
| - views::corewm::NativeCursorManagerDelegate* delegate) OVERRIDE;
|
| + ::wm::NativeCursorManagerDelegate* delegate) OVERRIDE;
|
|
|
| // The cursor location where the cursor was disabled.
|
| gfx::Point disabled_cursor_location_;
|
|
|