| 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 1f11aad41c97b1f9a358bf0093c2bf4db4faf466..d917af4945362232944babd49679c535f4f9f500 100644
|
| --- a/ui/views/widget/desktop_aura/desktop_native_cursor_manager.h
|
| +++ b/ui/views/widget/desktop_aura/desktop_native_cursor_manager.h
|
| @@ -20,18 +20,18 @@ namespace ui {
|
| class CursorLoader;
|
| }
|
|
|
| -namespace views {
|
| -class DesktopCursorLoaderUpdater;
|
| -
|
| -namespace corewm {
|
| +namespace wm {
|
| class NativeCursorManagerDelegate;
|
| }
|
|
|
| +namespace views {
|
| +class DesktopCursorLoaderUpdater;
|
| +
|
| // A NativeCursorManager that performs the desktop-specific setting of cursor
|
| // state. Similar to AshNativeCursorManager, it also communicates these changes
|
| // to all root windows.
|
| class VIEWS_EXPORT DesktopNativeCursorManager
|
| - : public views::corewm::NativeCursorManager {
|
| + : public wm::NativeCursorManager {
|
| public:
|
| DesktopNativeCursorManager(
|
| scoped_ptr<DesktopCursorLoaderUpdater> cursor_loader_updater);
|
| @@ -47,25 +47,25 @@ class VIEWS_EXPORT DesktopNativeCursorManager
|
| void RemoveHost(aura::WindowTreeHost* host);
|
|
|
| private:
|
| - // 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 SetCursorSet(
|
| ui::CursorSetType cursor_set,
|
| - 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 SetMouseEventsEnabled(
|
| bool enabled,
|
| - views::corewm::NativeCursorManagerDelegate* delegate) OVERRIDE;
|
| + wm::NativeCursorManagerDelegate* delegate) OVERRIDE;
|
|
|
| // The set of hosts to notify of changes in cursor state.
|
| typedef std::set<aura::WindowTreeHost*> Hosts;
|
|
|