OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 ASH_DISPLAY_CURSOR_WINDOW_CONTROLLER_H_ | 5 #ifndef ASH_DISPLAY_CURSOR_WINDOW_CONTROLLER_H_ |
6 #define ASH_DISPLAY_CURSOR_WINDOW_CONTROLLER_H_ | 6 #define ASH_DISPLAY_CURSOR_WINDOW_CONTROLLER_H_ |
7 | 7 |
| 8 #include <memory> |
| 9 |
8 #include "ash/ash_export.h" | 10 #include "ash/ash_export.h" |
9 #include "base/macros.h" | 11 #include "base/macros.h" |
10 #include "ui/aura/window.h" | 12 #include "ui/aura/window.h" |
11 #include "ui/base/cursor/cursor.h" | 13 #include "ui/base/cursor/cursor.h" |
12 #include "ui/gfx/display.h" | 14 #include "ui/gfx/display.h" |
13 | 15 |
14 namespace ash { | 16 namespace ash { |
15 namespace test { | 17 namespace test { |
16 class MirrorWindowTestApi; | 18 class MirrorWindowTestApi; |
17 } | 19 } |
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
80 // The last requested cursor visibility. | 82 // The last requested cursor visibility. |
81 bool visible_; | 83 bool visible_; |
82 | 84 |
83 ui::CursorSetType cursor_set_; | 85 ui::CursorSetType cursor_set_; |
84 gfx::Point hot_point_; | 86 gfx::Point hot_point_; |
85 | 87 |
86 // The display on which the cursor is drawn. | 88 // The display on which the cursor is drawn. |
87 // For mirroring mode, the display is always the primary display. | 89 // For mirroring mode, the display is always the primary display. |
88 gfx::Display display_; | 90 gfx::Display display_; |
89 | 91 |
90 scoped_ptr<aura::Window> cursor_window_; | 92 std::unique_ptr<aura::Window> cursor_window_; |
91 scoped_ptr<CursorWindowDelegate> delegate_; | 93 std::unique_ptr<CursorWindowDelegate> delegate_; |
92 | 94 |
93 DISALLOW_COPY_AND_ASSIGN(CursorWindowController); | 95 DISALLOW_COPY_AND_ASSIGN(CursorWindowController); |
94 }; | 96 }; |
95 | 97 |
96 } // namespace ash | 98 } // namespace ash |
97 | 99 |
98 #endif // ASH_DISPLAY_CURSOR_WINDOW_CONTROLLER_H_ | 100 #endif // ASH_DISPLAY_CURSOR_WINDOW_CONTROLLER_H_ |
OLD | NEW |