| Index: ui/wm/core/native_cursor_manager.h
|
| diff --git a/ui/wm/core/native_cursor_manager.h b/ui/wm/core/native_cursor_manager.h
|
| index def5c96d954189f8804256b974927287b34ffc6a..68c9d461865bcd0a4f2ebac13c328f3524b8d89e 100644
|
| --- a/ui/wm/core/native_cursor_manager.h
|
| +++ b/ui/wm/core/native_cursor_manager.h
|
| @@ -13,8 +13,7 @@ namespace gfx {
|
| class Display;
|
| }
|
|
|
| -namespace views {
|
| -namespace corewm {
|
| +namespace wm {
|
|
|
| // Interface where platforms such as Ash or Desktop aura are notified of
|
| // requested changes to cursor state. When requested, implementer should tell
|
| @@ -27,41 +26,40 @@ class WM_CORE_EXPORT NativeCursorManager {
|
| // A request to set the screen DPI. Can cause changes in the current cursor.
|
| virtual void SetDisplay(
|
| const gfx::Display& display,
|
| - views::corewm::NativeCursorManagerDelegate* delegate) = 0;
|
| + wm::NativeCursorManagerDelegate* delegate) = 0;
|
|
|
| // A request to set the cursor to |cursor|. At minimum, implementer should
|
| // call NativeCursorManagerDelegate::CommitCursor() with whatever cursor is
|
| // actually used.
|
| virtual void SetCursor(
|
| gfx::NativeCursor cursor,
|
| - views::corewm::NativeCursorManagerDelegate* delegate) = 0;
|
| + wm::NativeCursorManagerDelegate* delegate) = 0;
|
|
|
| // A request to set the visibility of the cursor. At minimum, implementer
|
| // should call NativeCursorManagerDelegate::CommitVisibility() with whatever
|
| // the visibility is.
|
| virtual void SetVisibility(
|
| bool visible,
|
| - views::corewm::NativeCursorManagerDelegate* delegate) = 0;
|
| + wm::NativeCursorManagerDelegate* delegate) = 0;
|
|
|
| // A request to set the scale of the cursor icon.
|
| virtual void SetScale(
|
| float scale,
|
| - views::corewm::NativeCursorManagerDelegate* delegate) = 0;
|
| + wm::NativeCursorManagerDelegate* delegate) = 0;
|
|
|
| // A request to set the scale of the cursor icon.
|
| virtual void SetCursorSet(
|
| ui::CursorSetType cursor_set,
|
| - views::corewm::NativeCursorManagerDelegate* delegate) = 0;
|
| + wm::NativeCursorManagerDelegate* delegate) = 0;
|
|
|
| // A request to set whether mouse events are disabled. At minimum,
|
| // implementer should call NativeCursorManagerDelegate::
|
| // CommitMouseEventsEnabled() with whether mouse events are actually enabled.
|
| virtual void SetMouseEventsEnabled(
|
| bool enabled,
|
| - views::corewm::NativeCursorManagerDelegate* delegate) = 0;
|
| + wm::NativeCursorManagerDelegate* delegate) = 0;
|
| };
|
|
|
| -} // namespace corewm
|
| -} // namespace views
|
| +} // namespace wm
|
|
|
| #endif // UI_WM_CORE_NATIVE_CURSOR_MANAGER_H_
|
|
|