| 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, |
| 11 aura::client::WindowTypeProperty*); |
| 10 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, bool) | 12 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, bool) |
| 11 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, base::string16*) | 13 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, base::string16*) |
| 12 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, ui::ModalType) | 14 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, ui::ModalType) |
| 13 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, gfx::ImageSkia*) | 15 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, gfx::ImageSkia*) |
| 14 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, gfx::Rect*) | 16 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, gfx::Rect*) |
| 15 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, std::string*) | 17 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, std::string*) |
| 16 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, ui::InputMethod*) | 18 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, ui::InputMethod*) |
| 17 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, ui::WindowShowState) | 19 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, ui::WindowShowState) |
| 18 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, void*) | 20 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, void*) |
| 19 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, SkColor) | 21 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, SkColor) |
| (...skipping 24 matching lines...) Expand all Loading... |
| 44 // and will be freed automatically. | 46 // and will be freed automatically. |
| 45 DEFINE_OWNED_WINDOW_PROPERTY_KEY(gfx::Rect, kRestoreBoundsKey, nullptr); | 47 DEFINE_OWNED_WINDOW_PROPERTY_KEY(gfx::Rect, kRestoreBoundsKey, nullptr); |
| 46 DEFINE_WINDOW_PROPERTY_KEY( | 48 DEFINE_WINDOW_PROPERTY_KEY( |
| 47 ui::WindowShowState, kRestoreShowStateKey, ui::SHOW_STATE_DEFAULT); | 49 ui::WindowShowState, kRestoreShowStateKey, ui::SHOW_STATE_DEFAULT); |
| 48 DEFINE_WINDOW_PROPERTY_KEY( | 50 DEFINE_WINDOW_PROPERTY_KEY( |
| 49 ui::WindowShowState, kShowStateKey, ui::SHOW_STATE_DEFAULT); | 51 ui::WindowShowState, kShowStateKey, ui::SHOW_STATE_DEFAULT); |
| 50 DEFINE_OWNED_WINDOW_PROPERTY_KEY(base::string16, kTitleKey, nullptr); | 52 DEFINE_OWNED_WINDOW_PROPERTY_KEY(base::string16, kTitleKey, nullptr); |
| 51 DEFINE_WINDOW_PROPERTY_KEY(int, kTopViewInset, 0); | 53 DEFINE_WINDOW_PROPERTY_KEY(int, kTopViewInset, 0); |
| 52 DEFINE_WINDOW_PROPERTY_KEY(SkColor, kTopViewColor, SK_ColorTRANSPARENT); | 54 DEFINE_WINDOW_PROPERTY_KEY(SkColor, kTopViewColor, SK_ColorTRANSPARENT); |
| 53 DEFINE_OWNED_WINDOW_PROPERTY_KEY(gfx::ImageSkia, kWindowIconKey, nullptr); | 55 DEFINE_OWNED_WINDOW_PROPERTY_KEY(gfx::ImageSkia, kWindowIconKey, nullptr); |
| 56 DEFINE_OWNED_WINDOW_PROPERTY_KEY(WindowTypeProperty, kWindowTypeKey, nullptr); |
| 54 | 57 |
| 55 } // namespace client | 58 } // namespace client |
| 56 } // namespace aura | 59 } // namespace aura |
| OLD | NEW |