| 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 "ui/aura/window_property.h" | 8 #include "ui/aura/window_property.h" |
| 8 #include "ui/gfx/rect.h" | 9 |
| 10 DECLARE_WINDOW_PROPERTY_TYPE(ash::wm::WindowState*); |
| 9 | 11 |
| 10 namespace ash { | 12 namespace ash { |
| 11 namespace internal { | 13 namespace internal { |
| 12 DEFINE_WINDOW_PROPERTY_KEY(bool, kAnimateToFullscreenKey, true); | 14 DEFINE_WINDOW_PROPERTY_KEY(bool, kAnimateToFullscreenKey, true); |
| 13 DEFINE_WINDOW_PROPERTY_KEY(bool, kFullscreenUsesMinimalChromeKey, false); | 15 DEFINE_WINDOW_PROPERTY_KEY(bool, kFullscreenUsesMinimalChromeKey, false); |
| 14 DEFINE_WINDOW_PROPERTY_KEY(bool, kStayInSameRootWindowKey, false); | 16 DEFINE_WINDOW_PROPERTY_KEY(bool, kStayInSameRootWindowKey, false); |
| 15 DEFINE_WINDOW_PROPERTY_KEY(bool, kUsesScreenCoordinatesKey, false); | 17 DEFINE_WINDOW_PROPERTY_KEY(bool, kUsesScreenCoordinatesKey, false); |
| 16 DEFINE_OWNED_WINDOW_PROPERTY_KEY(gfx::Rect, | 18 DEFINE_OWNED_WINDOW_PROPERTY_KEY(wm::WindowState, |
| 17 kPreAutoManagedWindowBoundsKey, | 19 kWindowStateKey, NULL); |
| 18 NULL); | |
| 19 DEFINE_WINDOW_PROPERTY_KEY(bool, kWindowRestoresToRestoreBounds, false); | |
| 20 | |
| 21 } // namespace internal | 20 } // namespace internal |
| 22 } // namespace ash | 21 } // namespace ash |
| OLD | NEW |