Chromium Code Reviews| Index: ui/aura/client/aura_constants.cc |
| diff --git a/ui/aura/client/aura_constants.cc b/ui/aura/client/aura_constants.cc |
| index 804993f25de26c6f40eabff292ae89414e97c97d..2ce79a3524308ef92dfaa62e95736da198284baf 100644 |
| --- a/ui/aura/client/aura_constants.cc |
| +++ b/ui/aura/client/aura_constants.cc |
| @@ -9,6 +9,7 @@ |
| DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, bool) |
| DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, ui::ModalType) |
| +DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, gfx::ImageSkia*) |
| DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, gfx::Rect*) |
| DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, ui::InputMethod*) |
| DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, ui::WindowShowState) |
| @@ -38,6 +39,7 @@ DEFINE_WINDOW_PROPERTY_KEY( |
| DEFINE_WINDOW_PROPERTY_KEY( |
| ui::WindowShowState, kShowStateKey, ui::SHOW_STATE_DEFAULT); |
| DEFINE_WINDOW_PROPERTY_KEY(int, kTopViewInset, 0); |
| +DEFINE_OWNED_WINDOW_PROPERTY_KEY(gfx::ImageSkia, kWindowIconKey, NULL); |
|
sky
2016/08/09 21:24:27
NULL -> nullptr
qiangchen
2016/08/09 22:07:34
Done.
|
| } // namespace client |
| } // namespace aura |