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