| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_CURSOR_MANAGER_H_ | 5 #ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_CURSOR_MANAGER_H_ |
| 6 #define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_CURSOR_MANAGER_H_ | 6 #define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_CURSOR_MANAGER_H_ |
| 7 | 7 |
| 8 #include <set> | 8 #include <set> |
| 9 | 9 |
| 10 #include "base/compiler_specific.h" | 10 #include "base/compiler_specific.h" |
| 11 #include "base/memory/scoped_ptr.h" | 11 #include "base/memory/scoped_ptr.h" |
| 12 #include "ui/views/corewm/native_cursor_manager.h" | |
| 13 #include "ui/views/views_export.h" | 12 #include "ui/views/views_export.h" |
| 13 #include "ui/wm/core/native_cursor_manager.h" |
| 14 | 14 |
| 15 namespace aura { | 15 namespace aura { |
| 16 class WindowTreeHost; | 16 class WindowTreeHost; |
| 17 } | 17 } |
| 18 | 18 |
| 19 namespace ui { | 19 namespace ui { |
| 20 class CursorLoader; | 20 class CursorLoader; |
| 21 } | 21 } |
| 22 | 22 |
| 23 namespace views { | 23 namespace views { |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 74 scoped_ptr<DesktopCursorLoaderUpdater> cursor_loader_updater_; | 74 scoped_ptr<DesktopCursorLoaderUpdater> cursor_loader_updater_; |
| 75 scoped_ptr<ui::CursorLoader> cursor_loader_; | 75 scoped_ptr<ui::CursorLoader> cursor_loader_; |
| 76 | 76 |
| 77 DISALLOW_COPY_AND_ASSIGN(DesktopNativeCursorManager); | 77 DISALLOW_COPY_AND_ASSIGN(DesktopNativeCursorManager); |
| 78 }; | 78 }; |
| 79 | 79 |
| 80 } // namespace views | 80 } // namespace views |
| 81 | 81 |
| 82 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_CURSOR_MANAGER_H_ | 82 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_CURSOR_MANAGER_H_ |
| 83 | 83 |
| OLD | NEW |