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_WINDOW_PROPERTIES_H_ | 5 #ifndef ASH_WM_WINDOW_PROPERTIES_H_ |
6 #define ASH_WM_WINDOW_PROPERTIES_H_ | 6 #define ASH_WM_WINDOW_PROPERTIES_H_ |
7 | 7 |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 | 9 |
10 #include "ash/ash_export.h" | 10 #include "ash/ash_export.h" |
11 #include "ash/common/shelf/shelf_item_types.h" | 11 #include "ash/common/shelf/shelf_item_types.h" |
| 12 #include "ui/base/class_property.h" |
12 #include "ui/base/ui_base_types.h" | 13 #include "ui/base/ui_base_types.h" |
13 #include "ui/gfx/geometry/rect.h" | 14 #include "ui/gfx/geometry/rect.h" |
14 | 15 |
15 namespace aura { | 16 namespace aura { |
16 template <typename T> | 17 template <typename T> |
17 struct WindowProperty; | 18 using WindowProperty = ui::ClassProperty<T>; |
18 } | 19 } |
19 | 20 |
20 namespace ash { | 21 namespace ash { |
21 namespace wm { | 22 namespace wm { |
22 class WindowState; | 23 class WindowState; |
23 } // namespace wm | 24 } // namespace wm |
24 | 25 |
25 // Used with kWidgetCreationType to indicate source of the widget creation. | 26 // Used with kWidgetCreationType to indicate source of the widget creation. |
26 enum class WidgetCreationType { | 27 enum class WidgetCreationType { |
27 // The widget was created internally, and not at the request of a client. | 28 // The widget was created internally, and not at the request of a client. |
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
79 | 80 |
80 // A property key to store WindowState in the window. The window state | 81 // A property key to store WindowState in the window. The window state |
81 // is owned by the window. | 82 // is owned by the window. |
82 extern const aura::WindowProperty<wm::WindowState*>* const kWindowStateKey; | 83 extern const aura::WindowProperty<wm::WindowState*>* const kWindowStateKey; |
83 | 84 |
84 // Alphabetical sort. | 85 // Alphabetical sort. |
85 | 86 |
86 } // namespace ash | 87 } // namespace ash |
87 | 88 |
88 #endif // ASH_WM_WINDOW_PROPERTIES_H_ | 89 #endif // ASH_WM_WINDOW_PROPERTIES_H_ |
OLD | NEW |