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 #include "ash/wm/window_properties.h" | 5 #include "ash/wm/window_properties.h" |
6 | 6 |
7 #include "ash/common/wm/window_state.h" | 7 #include "ash/common/wm/window_state.h" |
8 #include "ui/aura/window_property.h" | 8 #include "ui/base/class_property.h" |
9 | 9 |
10 DECLARE_WINDOW_PROPERTY_TYPE(ash::wm::WindowState*); | 10 DECLARE_UI_CLASS_PROPERTY_TYPE(ash::wm::WindowState*); |
11 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(ASH_EXPORT, ash::WidgetCreationType); | 11 DECLARE_EXPORTED_UI_CLASS_PROPERTY_TYPE(ASH_EXPORT, ash::WidgetCreationType); |
12 | 12 |
13 namespace ash { | 13 namespace ash { |
14 | 14 |
15 DEFINE_WINDOW_PROPERTY_KEY(bool, kLockedToRootKey, false); | 15 DEFINE_UI_CLASS_PROPERTY_KEY(bool, kLockedToRootKey, false); |
16 | 16 |
17 DEFINE_WINDOW_PROPERTY_KEY(bool, kPanelAttachedKey, true); | 17 DEFINE_UI_CLASS_PROPERTY_KEY(bool, kPanelAttachedKey, true); |
18 | 18 |
19 DEFINE_OWNED_WINDOW_PROPERTY_KEY(gfx::Rect, kRestoreBoundsOverrideKey, NULL); | 19 DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(gfx::Rect, kRestoreBoundsOverrideKey, NULL); |
20 | 20 |
21 DEFINE_WINDOW_PROPERTY_KEY(ui::WindowShowState, | 21 DEFINE_UI_CLASS_PROPERTY_KEY(ui::WindowShowState, |
22 kRestoreShowStateOverrideKey, | 22 kRestoreShowStateOverrideKey, |
23 ui::SHOW_STATE_DEFAULT); | 23 ui::SHOW_STATE_DEFAULT); |
24 | 24 |
25 DEFINE_WINDOW_PROPERTY_KEY(ShelfID, kShelfIDKey, kInvalidShelfID); | 25 DEFINE_UI_CLASS_PROPERTY_KEY(ShelfID, kShelfIDKey, kInvalidShelfID); |
26 | 26 |
27 DEFINE_WINDOW_PROPERTY_KEY(int32_t, kShelfItemTypeKey, TYPE_UNDEFINED); | 27 DEFINE_UI_CLASS_PROPERTY_KEY(int32_t, kShelfItemTypeKey, TYPE_UNDEFINED); |
28 | 28 |
29 DEFINE_WINDOW_PROPERTY_KEY(bool, kSnapChildrenToPixelBoundary, false); | 29 DEFINE_UI_CLASS_PROPERTY_KEY(bool, kSnapChildrenToPixelBoundary, false); |
30 | 30 |
31 DEFINE_WINDOW_PROPERTY_KEY(bool, kUsesScreenCoordinatesKey, false); | 31 DEFINE_UI_CLASS_PROPERTY_KEY(bool, kUsesScreenCoordinatesKey, false); |
32 | 32 |
33 DEFINE_WINDOW_PROPERTY_KEY(WidgetCreationType, | 33 DEFINE_UI_CLASS_PROPERTY_KEY(WidgetCreationType, |
34 kWidgetCreationTypeKey, | 34 kWidgetCreationTypeKey, |
35 WidgetCreationType::INTERNAL); | 35 WidgetCreationType::INTERNAL); |
36 | 36 |
37 DEFINE_OWNED_WINDOW_PROPERTY_KEY(wm::WindowState, kWindowStateKey, NULL); | 37 DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(ash::wm::WindowState, kWindowStateKey, NULL); |
38 | 38 |
39 } // namespace ash | 39 } // namespace ash |
OLD | NEW |