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/wm/window_state.h" | 7 #include "ash/wm/window_state.h" |
8 #include "ui/aura/window_property.h" | 8 #include "ui/aura/window_property.h" |
9 | 9 |
10 DECLARE_WINDOW_PROPERTY_TYPE(ash::wm::WindowState*); | 10 DECLARE_WINDOW_PROPERTY_TYPE(ash::wm::WindowState*); |
11 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(ASH_EXPORT, gfx::Rect*) | 11 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(ASH_EXPORT, gfx::Rect*) |
12 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(ASH_EXPORT, ui::WindowShowState) | 12 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(ASH_EXPORT, ui::WindowShowState) |
13 | 13 |
14 namespace ash { | 14 namespace ash { |
15 | 15 |
16 DEFINE_OWNED_WINDOW_PROPERTY_KEY(gfx::Rect, | 16 DEFINE_OWNED_WINDOW_PROPERTY_KEY(gfx::Rect, |
17 kRestoreBoundsOverrideKey, | 17 kRestoreBoundsOverrideKey, |
18 NULL); | 18 NULL); |
19 | 19 |
20 DEFINE_WINDOW_PROPERTY_KEY(ui::WindowShowState, | 20 DEFINE_WINDOW_PROPERTY_KEY(ui::WindowShowState, |
21 kRestoreShowStateOverrideKey, | 21 kRestoreShowStateOverrideKey, |
22 ui::SHOW_STATE_DEFAULT); | 22 ui::SHOW_STATE_DEFAULT); |
23 | 23 |
| 24 DEFINE_WINDOW_PROPERTY_KEY(bool, kSnapChildrenToPixelBoundary, false); |
| 25 |
24 DEFINE_WINDOW_PROPERTY_KEY(bool, kStayInSameRootWindowKey, false); | 26 DEFINE_WINDOW_PROPERTY_KEY(bool, kStayInSameRootWindowKey, false); |
| 27 |
25 DEFINE_WINDOW_PROPERTY_KEY(bool, kUsesScreenCoordinatesKey, false); | 28 DEFINE_WINDOW_PROPERTY_KEY(bool, kUsesScreenCoordinatesKey, false); |
| 29 |
26 DEFINE_OWNED_WINDOW_PROPERTY_KEY(wm::WindowState, | 30 DEFINE_OWNED_WINDOW_PROPERTY_KEY(wm::WindowState, |
27 kWindowStateKey, NULL); | 31 kWindowStateKey, NULL); |
28 | 32 |
29 } // namespace ash | 33 } // namespace ash |
OLD | NEW |