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 "ui/aura/client/aura_constants.h" | 5 #include "ui/aura/client/aura_constants.h" |
6 | 6 |
7 #include "ui/aura/window_property.h" | 7 #include "ui/aura/window_property.h" |
8 #include "ui/gfx/rect.h" | 8 #include "ui/gfx/rect.h" |
9 | 9 |
10 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, bool) | 10 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, bool) |
11 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, ui::ModalType) | 11 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, ui::ModalType) |
12 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, gfx::Rect*) | 12 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, gfx::Rect*) |
13 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, ui::InputMethod*) | 13 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, ui::InputMethod*) |
14 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, ui::WindowShowState) | 14 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, ui::WindowShowState) |
| 15 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, int) |
| 16 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, void*) |
15 | 17 |
16 namespace aura { | 18 namespace aura { |
17 namespace client { | 19 namespace client { |
18 | 20 |
19 // Alphabetical sort. | 21 // Alphabetical sort. |
20 | 22 |
21 DEFINE_WINDOW_PROPERTY_KEY(bool, kAlwaysOnTopKey, false); | 23 DEFINE_WINDOW_PROPERTY_KEY(bool, kAlwaysOnTopKey, false); |
22 DEFINE_WINDOW_PROPERTY_KEY(bool, kAnimationsDisabledKey, false); | 24 DEFINE_WINDOW_PROPERTY_KEY(bool, kAnimationsDisabledKey, false); |
23 DEFINE_WINDOW_PROPERTY_KEY(bool, kCanMaximizeKey, false); | 25 DEFINE_WINDOW_PROPERTY_KEY(bool, kCanMaximizeKey, false); |
24 DEFINE_WINDOW_PROPERTY_KEY(bool, kCanMinimizeKey, false); | 26 DEFINE_WINDOW_PROPERTY_KEY(bool, kCanMinimizeKey, false); |
25 DEFINE_WINDOW_PROPERTY_KEY(bool, kCanResizeKey, true); | 27 DEFINE_WINDOW_PROPERTY_KEY(bool, kCanResizeKey, true); |
26 DEFINE_WINDOW_PROPERTY_KEY(bool, kConstrainedWindowKey, false); | 28 DEFINE_WINDOW_PROPERTY_KEY(bool, kConstrainedWindowKey, false); |
27 DEFINE_WINDOW_PROPERTY_KEY(bool, kDrawAttentionKey, false); | 29 DEFINE_WINDOW_PROPERTY_KEY(bool, kDrawAttentionKey, false); |
28 DEFINE_WINDOW_PROPERTY_KEY(Window*, kHostWindowKey, NULL); | 30 DEFINE_WINDOW_PROPERTY_KEY(Window*, kHostWindowKey, NULL); |
29 DEFINE_WINDOW_PROPERTY_KEY(ui::ModalType, kModalKey, ui::MODAL_TYPE_NONE); | 31 DEFINE_WINDOW_PROPERTY_KEY(ui::ModalType, kModalKey, ui::MODAL_TYPE_NONE); |
30 // gfx::Rect object for RestoreBoundsKey property is owned by the window | 32 // gfx::Rect object for RestoreBoundsKey property is owned by the window |
31 // and will be freed automatically. | 33 // and will be freed automatically. |
32 DEFINE_OWNED_WINDOW_PROPERTY_KEY(gfx::Rect, kRestoreBoundsKey, NULL); | 34 DEFINE_OWNED_WINDOW_PROPERTY_KEY(gfx::Rect, kRestoreBoundsKey, NULL); |
33 DEFINE_WINDOW_PROPERTY_KEY( | 35 DEFINE_WINDOW_PROPERTY_KEY( |
34 ui::WindowShowState, kRestoreShowStateKey, ui::SHOW_STATE_DEFAULT); | 36 ui::WindowShowState, kRestoreShowStateKey, ui::SHOW_STATE_DEFAULT); |
35 DEFINE_WINDOW_PROPERTY_KEY(ui::InputMethod*, kRootWindowInputMethodKey, NULL); | 37 DEFINE_WINDOW_PROPERTY_KEY(ui::InputMethod*, kRootWindowInputMethodKey, NULL); |
36 DEFINE_WINDOW_PROPERTY_KEY( | 38 DEFINE_WINDOW_PROPERTY_KEY( |
37 ui::WindowShowState, kShowStateKey, ui::SHOW_STATE_DEFAULT); | 39 ui::WindowShowState, kShowStateKey, ui::SHOW_STATE_DEFAULT); |
38 | 40 |
39 } // namespace client | 41 } // namespace client |
40 } // namespace aura | 42 } // namespace aura |
OLD | NEW |