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 ASH_WM_DRAG_WINDOW_CONTROLLER_H_ | 5 #ifndef ASH_WM_DRAG_WINDOW_CONTROLLER_H_ |
6 #define ASH_WM_DRAG_WINDOW_CONTROLLER_H_ | 6 #define ASH_WM_DRAG_WINDOW_CONTROLLER_H_ |
7 | 7 |
| 8 #include <memory> |
8 #include <vector> | 9 #include <vector> |
9 | 10 |
10 #include "ash/ash_export.h" | 11 #include "ash/ash_export.h" |
11 #include "base/gtest_prod_util.h" | 12 #include "base/gtest_prod_util.h" |
12 #include "base/macros.h" | 13 #include "base/macros.h" |
13 #include "base/memory/scoped_ptr.h" | |
14 #include "ui/gfx/display.h" | 14 #include "ui/gfx/display.h" |
15 #include "ui/gfx/geometry/rect.h" | 15 #include "ui/gfx/geometry/rect.h" |
16 | 16 |
17 namespace aura { | 17 namespace aura { |
18 class Window; | 18 class Window; |
19 } | 19 } |
20 | 20 |
21 namespace ui { | 21 namespace ui { |
22 class LayerTreeOwner; | 22 class LayerTreeOwner; |
23 } | 23 } |
(...skipping 25 matching lines...) Expand all Loading... |
49 // currently active drag windows list. | 49 // currently active drag windows list. |
50 const aura::Window* GetDragWindowForTest(size_t index) const; | 50 const aura::Window* GetDragWindowForTest(size_t index) const; |
51 const ui::LayerTreeOwner* GetDragLayerOwnerForTest(size_t index) const; | 51 const ui::LayerTreeOwner* GetDragLayerOwnerForTest(size_t index) const; |
52 | 52 |
53 private: | 53 private: |
54 class DragWindowDetails; | 54 class DragWindowDetails; |
55 | 55 |
56 // Window the drag window is placed beneath. | 56 // Window the drag window is placed beneath. |
57 aura::Window* window_; | 57 aura::Window* window_; |
58 | 58 |
59 std::vector<scoped_ptr<DragWindowDetails>> drag_windows_; | 59 std::vector<std::unique_ptr<DragWindowDetails>> drag_windows_; |
60 | 60 |
61 DISALLOW_COPY_AND_ASSIGN(DragWindowController); | 61 DISALLOW_COPY_AND_ASSIGN(DragWindowController); |
62 }; | 62 }; |
63 | 63 |
64 } // namespace ash | 64 } // namespace ash |
65 | 65 |
66 #endif // ASH_WM_DRAG_WINDOW_CONTROLLER_H_ | 66 #endif // ASH_WM_DRAG_WINDOW_CONTROLLER_H_ |
OLD | NEW |