| 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/common/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 | 11 |
| 12 namespace ash { | 12 namespace ash { |
| 13 | 13 |
| 14 DEFINE_OWNED_WINDOW_PROPERTY_KEY(gfx::Rect, | 14 DEFINE_OWNED_WINDOW_PROPERTY_KEY(gfx::Rect, |
| 15 kRestoreBoundsOverrideKey, | 15 kRestoreBoundsOverrideKey, |
| 16 NULL); | 16 NULL); |
| 17 | 17 |
| 18 DEFINE_WINDOW_PROPERTY_KEY(ui::WindowShowState, | 18 DEFINE_WINDOW_PROPERTY_KEY(ui::WindowShowState, |
| 19 kRestoreShowStateOverrideKey, | 19 kRestoreShowStateOverrideKey, |
| 20 ui::SHOW_STATE_DEFAULT); | 20 ui::SHOW_STATE_DEFAULT); |
| 21 | 21 |
| 22 DEFINE_WINDOW_PROPERTY_KEY(bool, kSnapChildrenToPixelBoundary, false); | 22 DEFINE_WINDOW_PROPERTY_KEY(bool, kSnapChildrenToPixelBoundary, false); |
| 23 | 23 |
| 24 DEFINE_WINDOW_PROPERTY_KEY(bool, kStayInSameRootWindowKey, false); | 24 DEFINE_WINDOW_PROPERTY_KEY(bool, kStayInSameRootWindowKey, false); |
| 25 | 25 |
| 26 DEFINE_WINDOW_PROPERTY_KEY(bool, kUsesScreenCoordinatesKey, false); | 26 DEFINE_WINDOW_PROPERTY_KEY(bool, kUsesScreenCoordinatesKey, false); |
| 27 | 27 |
| 28 DEFINE_OWNED_WINDOW_PROPERTY_KEY(wm::WindowState, | 28 DEFINE_OWNED_WINDOW_PROPERTY_KEY(wm::WindowState, |
| 29 kWindowStateKey, NULL); | 29 kWindowStateKey, NULL); |
| 30 | 30 |
| 31 } // namespace ash | 31 } // namespace ash |
| OLD | NEW |