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) |
(...skipping 26 matching lines...) Expand all Loading... |
37 // gfx::Rect object for RestoreBoundsKey property is owned by the window | 37 // gfx::Rect object for RestoreBoundsKey property is owned by the window |
38 // and will be freed automatically. | 38 // and will be freed automatically. |
39 DEFINE_OWNED_WINDOW_PROPERTY_KEY(gfx::Rect, kRestoreBoundsKey, nullptr); | 39 DEFINE_OWNED_WINDOW_PROPERTY_KEY(gfx::Rect, kRestoreBoundsKey, nullptr); |
40 DEFINE_WINDOW_PROPERTY_KEY( | 40 DEFINE_WINDOW_PROPERTY_KEY( |
41 ui::WindowShowState, kRestoreShowStateKey, ui::SHOW_STATE_DEFAULT); | 41 ui::WindowShowState, kRestoreShowStateKey, ui::SHOW_STATE_DEFAULT); |
42 DEFINE_WINDOW_PROPERTY_KEY( | 42 DEFINE_WINDOW_PROPERTY_KEY( |
43 ui::WindowShowState, kShowStateKey, ui::SHOW_STATE_DEFAULT); | 43 ui::WindowShowState, kShowStateKey, ui::SHOW_STATE_DEFAULT); |
44 DEFINE_WINDOW_PROPERTY_KEY(int, kTopViewInset, 0); | 44 DEFINE_WINDOW_PROPERTY_KEY(int, kTopViewInset, 0); |
45 DEFINE_WINDOW_PROPERTY_KEY(SkColor, kTopViewColor, SK_ColorTRANSPARENT); | 45 DEFINE_WINDOW_PROPERTY_KEY(SkColor, kTopViewColor, SK_ColorTRANSPARENT); |
46 DEFINE_OWNED_WINDOW_PROPERTY_KEY(gfx::ImageSkia, kWindowIconKey, nullptr); | 46 DEFINE_OWNED_WINDOW_PROPERTY_KEY(gfx::ImageSkia, kWindowIconKey, nullptr); |
| 47 DEFINE_OWNED_WINDOW_PROPERTY_KEY(gfx::ImageSkia, kAppIconKey, nullptr); |
47 | 48 |
48 } // namespace client | 49 } // namespace client |
49 } // namespace aura | 50 } // namespace aura |
OLD | NEW |