| 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, std::string*) |
| 14 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, ui::InputMethod*) | 15 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, ui::InputMethod*) |
| 15 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, ui::WindowShowState) | 16 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, ui::WindowShowState) |
| 16 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, int) | 17 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, int) |
| 17 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, void*) | 18 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, void*) |
| 18 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, SkColor) | 19 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, SkColor) |
| 19 | 20 |
| 20 namespace aura { | 21 namespace aura { |
| 21 namespace client { | 22 namespace client { |
| 22 | 23 |
| 23 // Alphabetical sort. | 24 // Alphabetical sort. |
| 24 | 25 |
| 25 DEFINE_WINDOW_PROPERTY_KEY(bool, kAlwaysOnTopKey, false); | 26 DEFINE_WINDOW_PROPERTY_KEY(bool, kAlwaysOnTopKey, false); |
| 26 DEFINE_WINDOW_PROPERTY_KEY(bool, kAnimationsDisabledKey, false); | 27 DEFINE_WINDOW_PROPERTY_KEY(bool, kAnimationsDisabledKey, false); |
| 28 DEFINE_OWNED_WINDOW_PROPERTY_KEY(gfx::ImageSkia, kAppIconKey, nullptr); |
| 29 DEFINE_OWNED_WINDOW_PROPERTY_KEY(std::string, kAppIdKey, nullptr); |
| 27 DEFINE_WINDOW_PROPERTY_KEY(int, kAppType, 0); | 30 DEFINE_WINDOW_PROPERTY_KEY(int, kAppType, 0); |
| 28 DEFINE_WINDOW_PROPERTY_KEY(bool, kCanMaximizeKey, false); | 31 DEFINE_WINDOW_PROPERTY_KEY(bool, kCanMaximizeKey, false); |
| 29 DEFINE_WINDOW_PROPERTY_KEY(bool, kCanMinimizeKey, false); | 32 DEFINE_WINDOW_PROPERTY_KEY(bool, kCanMinimizeKey, false); |
| 30 DEFINE_WINDOW_PROPERTY_KEY(bool, kCanResizeKey, true); | 33 DEFINE_WINDOW_PROPERTY_KEY(bool, kCanResizeKey, true); |
| 31 DEFINE_WINDOW_PROPERTY_KEY(bool, kConstrainedWindowKey, false); | 34 DEFINE_WINDOW_PROPERTY_KEY(bool, kConstrainedWindowKey, false); |
| 32 DEFINE_WINDOW_PROPERTY_KEY(bool, kDrawAttentionKey, false); | 35 DEFINE_WINDOW_PROPERTY_KEY(bool, kDrawAttentionKey, false); |
| 33 DEFINE_WINDOW_PROPERTY_KEY(bool, kExcludeFromMruKey, false); | 36 DEFINE_WINDOW_PROPERTY_KEY(bool, kExcludeFromMruKey, false); |
| 34 DEFINE_WINDOW_PROPERTY_KEY(bool, kMirroringEnabledKey, false); | 37 DEFINE_WINDOW_PROPERTY_KEY(bool, kMirroringEnabledKey, false); |
| 35 DEFINE_WINDOW_PROPERTY_KEY(Window*, kHostWindowKey, nullptr); | 38 DEFINE_WINDOW_PROPERTY_KEY(Window*, kHostWindowKey, nullptr); |
| 36 DEFINE_WINDOW_PROPERTY_KEY(ui::ModalType, kModalKey, ui::MODAL_TYPE_NONE); | 39 DEFINE_WINDOW_PROPERTY_KEY(ui::ModalType, kModalKey, ui::MODAL_TYPE_NONE); |
| 37 // gfx::Rect object for RestoreBoundsKey property is owned by the window | 40 // gfx::Rect object for RestoreBoundsKey property is owned by the window |
| 38 // and will be freed automatically. | 41 // and will be freed automatically. |
| 39 DEFINE_OWNED_WINDOW_PROPERTY_KEY(gfx::Rect, kRestoreBoundsKey, nullptr); | 42 DEFINE_OWNED_WINDOW_PROPERTY_KEY(gfx::Rect, kRestoreBoundsKey, nullptr); |
| 40 DEFINE_WINDOW_PROPERTY_KEY( | 43 DEFINE_WINDOW_PROPERTY_KEY( |
| 41 ui::WindowShowState, kRestoreShowStateKey, ui::SHOW_STATE_DEFAULT); | 44 ui::WindowShowState, kRestoreShowStateKey, ui::SHOW_STATE_DEFAULT); |
| 42 DEFINE_WINDOW_PROPERTY_KEY( | 45 DEFINE_WINDOW_PROPERTY_KEY( |
| 43 ui::WindowShowState, kShowStateKey, ui::SHOW_STATE_DEFAULT); | 46 ui::WindowShowState, kShowStateKey, ui::SHOW_STATE_DEFAULT); |
| 44 DEFINE_WINDOW_PROPERTY_KEY(int, kTopViewInset, 0); | 47 DEFINE_WINDOW_PROPERTY_KEY(int, kTopViewInset, 0); |
| 45 DEFINE_WINDOW_PROPERTY_KEY(SkColor, kTopViewColor, SK_ColorTRANSPARENT); | 48 DEFINE_WINDOW_PROPERTY_KEY(SkColor, kTopViewColor, SK_ColorTRANSPARENT); |
| 46 DEFINE_OWNED_WINDOW_PROPERTY_KEY(gfx::ImageSkia, kWindowIconKey, nullptr); | 49 DEFINE_OWNED_WINDOW_PROPERTY_KEY(gfx::ImageSkia, kWindowIconKey, nullptr); |
| 47 | 50 |
| 48 } // namespace client | 51 } // namespace client |
| 49 } // namespace aura | 52 } // namespace aura |
| OLD | NEW |