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/geometry/rect.h" | 8 #include "ui/gfx/geometry/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::ImageSkia*) | 12 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, gfx::ImageSkia*) |
13 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, gfx::Rect*) | 13 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, gfx::Rect*) |
14 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, ui::InputMethod*) | 14 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, ui::InputMethod*) |
15 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, ui::WindowShowState) | 15 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, ui::WindowShowState) |
16 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, int) | 16 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, int) |
17 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, void*) | 17 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, void*) |
18 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, SkColor) | 18 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, SkColor) |
19 | 19 |
20 namespace aura { | 20 namespace aura { |
21 namespace client { | 21 namespace client { |
22 | 22 |
23 // Alphabetical sort. | 23 // Alphabetical sort. |
24 | 24 |
25 DEFINE_WINDOW_PROPERTY_KEY(bool, kAlwaysOnTopKey, false); | 25 DEFINE_WINDOW_PROPERTY_KEY(bool, kAlwaysOnTopKey, false); |
26 DEFINE_WINDOW_PROPERTY_KEY(bool, kAnimationsDisabledKey, false); | 26 DEFINE_WINDOW_PROPERTY_KEY(bool, kAnimationsDisabledKey, false); |
27 DEFINE_WINDOW_PROPERTY_KEY(int, kAppType, 0); | |
Daniel Erat
2016/09/27 19:15:10
can you use the enum here instead of 0?
xiaoyinh(OOO Sep 11-29)
2016/09/29 20:37:44
Thanks for the suggestion. I tried including app_t
| |
27 DEFINE_WINDOW_PROPERTY_KEY(bool, kCanMaximizeKey, false); | 28 DEFINE_WINDOW_PROPERTY_KEY(bool, kCanMaximizeKey, false); |
28 DEFINE_WINDOW_PROPERTY_KEY(bool, kCanMinimizeKey, false); | 29 DEFINE_WINDOW_PROPERTY_KEY(bool, kCanMinimizeKey, false); |
29 DEFINE_WINDOW_PROPERTY_KEY(bool, kCanResizeKey, true); | 30 DEFINE_WINDOW_PROPERTY_KEY(bool, kCanResizeKey, true); |
30 DEFINE_WINDOW_PROPERTY_KEY(bool, kConstrainedWindowKey, false); | 31 DEFINE_WINDOW_PROPERTY_KEY(bool, kConstrainedWindowKey, false); |
31 DEFINE_WINDOW_PROPERTY_KEY(bool, kDrawAttentionKey, false); | 32 DEFINE_WINDOW_PROPERTY_KEY(bool, kDrawAttentionKey, false); |
32 DEFINE_WINDOW_PROPERTY_KEY(bool, kExcludeFromMruKey, false); | 33 DEFINE_WINDOW_PROPERTY_KEY(bool, kExcludeFromMruKey, false); |
33 DEFINE_WINDOW_PROPERTY_KEY(bool, kMirroringEnabledKey, false); | 34 DEFINE_WINDOW_PROPERTY_KEY(bool, kMirroringEnabledKey, false); |
34 DEFINE_WINDOW_PROPERTY_KEY(Window*, kHostWindowKey, nullptr); | 35 DEFINE_WINDOW_PROPERTY_KEY(Window*, kHostWindowKey, nullptr); |
35 DEFINE_WINDOW_PROPERTY_KEY(ui::ModalType, kModalKey, ui::MODAL_TYPE_NONE); | 36 DEFINE_WINDOW_PROPERTY_KEY(ui::ModalType, kModalKey, ui::MODAL_TYPE_NONE); |
36 // gfx::Rect object for RestoreBoundsKey property is owned by the window | 37 // gfx::Rect object for RestoreBoundsKey property is owned by the window |
37 // and will be freed automatically. | 38 // and will be freed automatically. |
38 DEFINE_OWNED_WINDOW_PROPERTY_KEY(gfx::Rect, kRestoreBoundsKey, nullptr); | 39 DEFINE_OWNED_WINDOW_PROPERTY_KEY(gfx::Rect, kRestoreBoundsKey, nullptr); |
39 DEFINE_WINDOW_PROPERTY_KEY( | 40 DEFINE_WINDOW_PROPERTY_KEY( |
40 ui::WindowShowState, kRestoreShowStateKey, ui::SHOW_STATE_DEFAULT); | 41 ui::WindowShowState, kRestoreShowStateKey, ui::SHOW_STATE_DEFAULT); |
41 DEFINE_WINDOW_PROPERTY_KEY( | 42 DEFINE_WINDOW_PROPERTY_KEY( |
42 ui::WindowShowState, kShowStateKey, ui::SHOW_STATE_DEFAULT); | 43 ui::WindowShowState, kShowStateKey, ui::SHOW_STATE_DEFAULT); |
43 DEFINE_WINDOW_PROPERTY_KEY(int, kTopViewInset, 0); | 44 DEFINE_WINDOW_PROPERTY_KEY(int, kTopViewInset, 0); |
44 DEFINE_WINDOW_PROPERTY_KEY(SkColor, kTopViewColor, SK_ColorTRANSPARENT); | 45 DEFINE_WINDOW_PROPERTY_KEY(SkColor, kTopViewColor, SK_ColorTRANSPARENT); |
45 DEFINE_OWNED_WINDOW_PROPERTY_KEY(gfx::ImageSkia, kWindowIconKey, nullptr); | 46 DEFINE_OWNED_WINDOW_PROPERTY_KEY(gfx::ImageSkia, kWindowIconKey, nullptr); |
46 | 47 |
47 } // namespace client | 48 } // namespace client |
48 } // namespace aura | 49 } // namespace aura |
OLD | NEW |