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 "services/ui/public/interfaces/window_manager_constants.mojom.h" | 7 #include "services/ui/public/interfaces/window_manager_constants.mojom.h" |
8 #include "ui/aura/window_property.h" | 8 #include "ui/base/class_property.h" |
9 #include "ui/gfx/geometry/rect.h" | 9 #include "ui/gfx/geometry/rect.h" |
10 | 10 |
11 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, bool) | 11 DECLARE_EXPORTED_UI_CLASS_PROPERTY_TYPE(AURA_EXPORT, bool) |
12 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, base::string16*) | 12 DECLARE_EXPORTED_UI_CLASS_PROPERTY_TYPE(AURA_EXPORT, base::string16*) |
13 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, ui::ModalType) | 13 DECLARE_EXPORTED_UI_CLASS_PROPERTY_TYPE(AURA_EXPORT, ui::ModalType) |
14 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, gfx::ImageSkia*) | 14 DECLARE_EXPORTED_UI_CLASS_PROPERTY_TYPE(AURA_EXPORT, gfx::ImageSkia*) |
15 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, gfx::Rect*) | 15 DECLARE_EXPORTED_UI_CLASS_PROPERTY_TYPE(AURA_EXPORT, gfx::Rect*) |
16 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, gfx::Size*) | 16 DECLARE_EXPORTED_UI_CLASS_PROPERTY_TYPE(AURA_EXPORT, gfx::Size*) |
17 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, std::string*) | 17 DECLARE_EXPORTED_UI_CLASS_PROPERTY_TYPE(AURA_EXPORT, std::string*) |
18 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, ui::WindowShowState) | 18 DECLARE_EXPORTED_UI_CLASS_PROPERTY_TYPE(AURA_EXPORT, ui::WindowShowState) |
19 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, ui::mojom::WindowType); | 19 DECLARE_EXPORTED_UI_CLASS_PROPERTY_TYPE(AURA_EXPORT, ui::mojom::WindowType); |
20 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, void*) | 20 DECLARE_EXPORTED_UI_CLASS_PROPERTY_TYPE(AURA_EXPORT, void*) |
21 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, SkColor) | 21 DECLARE_EXPORTED_UI_CLASS_PROPERTY_TYPE(AURA_EXPORT, SkColor) |
22 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, int32_t) | 22 DECLARE_EXPORTED_UI_CLASS_PROPERTY_TYPE(AURA_EXPORT, int32_t) |
23 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, int64_t) | 23 DECLARE_EXPORTED_UI_CLASS_PROPERTY_TYPE(AURA_EXPORT, int64_t) |
24 | 24 |
25 namespace aura { | 25 namespace aura { |
26 namespace client { | 26 namespace client { |
27 | 27 |
28 // Alphabetical sort. | 28 // Alphabetical sort. |
29 | 29 |
30 DEFINE_WINDOW_PROPERTY_KEY(bool, kAccessibilityFocusFallsbackToWidgetKey, true); | 30 DEFINE_UI_CLASS_PROPERTY_KEY( |
31 DEFINE_WINDOW_PROPERTY_KEY(bool, kAlwaysOnTopKey, false); | 31 bool, kAccessibilityFocusFallsbackToWidgetKey, true); |
32 DEFINE_WINDOW_PROPERTY_KEY(bool, kAnimationsDisabledKey, false); | 32 DEFINE_UI_CLASS_PROPERTY_KEY(bool, kAlwaysOnTopKey, false); |
33 DEFINE_OWNED_WINDOW_PROPERTY_KEY(gfx::ImageSkia, kAppIconKey, nullptr); | 33 DEFINE_UI_CLASS_PROPERTY_KEY(bool, kAnimationsDisabledKey, false); |
34 DEFINE_OWNED_WINDOW_PROPERTY_KEY(std::string, kAppIdKey, nullptr); | 34 DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(gfx::ImageSkia, kAppIconKey, nullptr); |
35 DEFINE_WINDOW_PROPERTY_KEY(int, kAppType, 0); | 35 DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(std::string, kAppIdKey, nullptr); |
36 DEFINE_WINDOW_PROPERTY_KEY(bool, kConstrainedWindowKey, false); | 36 DEFINE_UI_CLASS_PROPERTY_KEY(int, kAppType, 0); |
37 DEFINE_WINDOW_PROPERTY_KEY(bool, kDrawAttentionKey, false); | 37 DEFINE_UI_CLASS_PROPERTY_KEY(bool, kConstrainedWindowKey, false); |
38 DEFINE_WINDOW_PROPERTY_KEY(Window*, kHostWindowKey, nullptr); | 38 DEFINE_UI_CLASS_PROPERTY_KEY(bool, kDrawAttentionKey, false); |
39 DEFINE_WINDOW_PROPERTY_KEY(bool, kImmersiveFullscreenKey, false); | 39 DEFINE_UI_CLASS_PROPERTY_KEY(Window*, kHostWindowKey, nullptr); |
40 DEFINE_WINDOW_PROPERTY_KEY(bool, kMirroringEnabledKey, false); | 40 DEFINE_UI_CLASS_PROPERTY_KEY(bool, kImmersiveFullscreenKey, false); |
41 DEFINE_WINDOW_PROPERTY_KEY(ui::ModalType, kModalKey, ui::MODAL_TYPE_NONE); | 41 DEFINE_UI_CLASS_PROPERTY_KEY(bool, kMirroringEnabledKey, false); |
42 DEFINE_OWNED_WINDOW_PROPERTY_KEY(std::string, kNameKey, nullptr); | 42 DEFINE_UI_CLASS_PROPERTY_KEY(ui::ModalType, kModalKey, ui::MODAL_TYPE_NONE); |
43 DEFINE_OWNED_WINDOW_PROPERTY_KEY(gfx::Size, kPreferredSize, nullptr); | 43 DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(std::string, kNameKey, nullptr); |
44 DEFINE_WINDOW_PROPERTY_KEY( | 44 DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(gfx::Size, kPreferredSize, nullptr); |
| 45 DEFINE_UI_CLASS_PROPERTY_KEY( |
45 ui::WindowShowState, kPreMinimizedShowStateKey, ui::SHOW_STATE_DEFAULT); | 46 ui::WindowShowState, kPreMinimizedShowStateKey, ui::SHOW_STATE_DEFAULT); |
46 DEFINE_WINDOW_PROPERTY_KEY( | 47 DEFINE_UI_CLASS_PROPERTY_KEY( |
47 ui::WindowShowState, kPreFullscreenShowStateKey, ui::SHOW_STATE_DEFAULT); | 48 ui::WindowShowState, kPreFullscreenShowStateKey, ui::SHOW_STATE_DEFAULT); |
48 DEFINE_WINDOW_PROPERTY_KEY(int32_t, | 49 DEFINE_UI_CLASS_PROPERTY_KEY(int32_t, |
49 kResizeBehaviorKey, | 50 kResizeBehaviorKey, |
50 ui::mojom::kResizeBehaviorCanResize); | 51 ui::mojom::kResizeBehaviorCanResize); |
51 DEFINE_OWNED_WINDOW_PROPERTY_KEY(gfx::Rect, kRestoreBoundsKey, nullptr); | 52 DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(gfx::Rect, kRestoreBoundsKey, nullptr); |
52 DEFINE_WINDOW_PROPERTY_KEY( | 53 DEFINE_UI_CLASS_PROPERTY_KEY( |
53 ui::WindowShowState, kShowStateKey, ui::SHOW_STATE_DEFAULT); | 54 ui::WindowShowState, kShowStateKey, ui::SHOW_STATE_DEFAULT); |
54 DEFINE_OWNED_WINDOW_PROPERTY_KEY(base::string16, kTitleKey, nullptr); | 55 DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(base::string16, kTitleKey, nullptr); |
55 DEFINE_WINDOW_PROPERTY_KEY(int, kTopViewInset, 0); | 56 DEFINE_UI_CLASS_PROPERTY_KEY(int, kTopViewInset, 0); |
56 DEFINE_WINDOW_PROPERTY_KEY(SkColor, kTopViewColor, SK_ColorTRANSPARENT); | 57 DEFINE_UI_CLASS_PROPERTY_KEY(SkColor, kTopViewColor, SK_ColorTRANSPARENT); |
57 DEFINE_OWNED_WINDOW_PROPERTY_KEY(gfx::ImageSkia, kWindowIconKey, nullptr); | 58 DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(gfx::ImageSkia, kWindowIconKey, nullptr); |
58 DEFINE_WINDOW_PROPERTY_KEY(ui::mojom::WindowType, | 59 DEFINE_UI_CLASS_PROPERTY_KEY(ui::mojom::WindowType, |
59 kWindowTypeKey, | 60 kWindowTypeKey, |
60 ui::mojom::WindowType::UNKNOWN); | 61 ui::mojom::WindowType::UNKNOWN); |
61 | 62 |
62 } // namespace client | 63 } // namespace client |
63 } // namespace aura | 64 } // namespace aura |
OLD | NEW |