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_WM_OVERVIEW_WINDOW_GRID_H_ | 5 #ifndef ASH_WM_OVERVIEW_WINDOW_GRID_H_ |
6 #define ASH_WM_OVERVIEW_WINDOW_GRID_H_ | 6 #define ASH_WM_OVERVIEW_WINDOW_GRID_H_ |
7 | 7 |
8 #include <stddef.h> | 8 #include <stddef.h> |
9 | 9 |
| 10 #include <memory> |
10 #include <set> | 11 #include <set> |
11 #include <vector> | 12 #include <vector> |
12 | 13 |
13 #include "ash/wm/overview/window_selector.h" | 14 #include "ash/wm/overview/window_selector.h" |
14 #include "base/macros.h" | 15 #include "base/macros.h" |
15 #include "base/memory/scoped_ptr.h" | |
16 #include "ui/aura/window_observer.h" | 16 #include "ui/aura/window_observer.h" |
17 | 17 |
18 namespace aura { | 18 namespace aura { |
19 class Window; | 19 class Window; |
20 } | 20 } |
21 | 21 |
22 namespace views { | 22 namespace views { |
23 class Widget; | 23 class Widget; |
24 } | 24 } |
25 | 25 |
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
126 // Pointer to the window selector that spawned this grid. | 126 // Pointer to the window selector that spawned this grid. |
127 WindowSelector* window_selector_; | 127 WindowSelector* window_selector_; |
128 | 128 |
129 // Vector containing all the windows in this grid. | 129 // Vector containing all the windows in this grid. |
130 ScopedVector<WindowSelectorItem> window_list_; | 130 ScopedVector<WindowSelectorItem> window_list_; |
131 | 131 |
132 // Vector containing the observed windows. | 132 // Vector containing the observed windows. |
133 std::set<aura::Window*> observed_windows_; | 133 std::set<aura::Window*> observed_windows_; |
134 | 134 |
135 // Widget that indicates to the user which is the selected window. | 135 // Widget that indicates to the user which is the selected window. |
136 scoped_ptr<views::Widget> selection_widget_; | 136 std::unique_ptr<views::Widget> selection_widget_; |
137 | 137 |
138 // Current selected window position. | 138 // Current selected window position. |
139 size_t selected_index_; | 139 size_t selected_index_; |
140 | 140 |
141 // Number of columns in the grid. | 141 // Number of columns in the grid. |
142 size_t num_columns_; | 142 size_t num_columns_; |
143 | 143 |
144 DISALLOW_COPY_AND_ASSIGN(WindowGrid); | 144 DISALLOW_COPY_AND_ASSIGN(WindowGrid); |
145 }; | 145 }; |
146 | 146 |
147 } // namespace ash | 147 } // namespace ash |
148 | 148 |
149 #endif // ASH_WM_OVERVIEW_WINDOW_GRID_H_ | 149 #endif // ASH_WM_OVERVIEW_WINDOW_GRID_H_ |
OLD | NEW |