| Index: ui/aura/client/aura_constants.cc
|
| diff --git a/ui/aura/client/aura_constants.cc b/ui/aura/client/aura_constants.cc
|
| index 8287c8e4898c1f837e1ffd75a7199d098bc154e2..a588e5b6aefb826c9fb4010f0d214fa166b55b8f 100644
|
| --- a/ui/aura/client/aura_constants.cc
|
| +++ b/ui/aura/client/aura_constants.cc
|
| @@ -4,6 +4,7 @@
|
|
|
| #include "ui/aura/client/aura_constants.h"
|
|
|
| +#include "services/ui/public/interfaces/window_manager_constants.mojom.h"
|
| #include "ui/aura/window_property.h"
|
| #include "ui/gfx/geometry/rect.h"
|
|
|
| @@ -15,6 +16,7 @@ DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, gfx::Rect*)
|
| DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, std::string*)
|
| DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, ui::InputMethod*)
|
| DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, ui::WindowShowState)
|
| +DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, ui::mojom::WindowType);
|
| DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, void*)
|
| DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, SkColor)
|
| DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, int32_t)
|
| @@ -51,6 +53,9 @@ DEFINE_OWNED_WINDOW_PROPERTY_KEY(base::string16, kTitleKey, nullptr);
|
| DEFINE_WINDOW_PROPERTY_KEY(int, kTopViewInset, 0);
|
| DEFINE_WINDOW_PROPERTY_KEY(SkColor, kTopViewColor, SK_ColorTRANSPARENT);
|
| DEFINE_OWNED_WINDOW_PROPERTY_KEY(gfx::ImageSkia, kWindowIconKey, nullptr);
|
| +DEFINE_WINDOW_PROPERTY_KEY(ui::mojom::WindowType,
|
| + kWindowTypeKey,
|
| + ui::mojom::WindowType::UNKNOWN);
|
|
|
| } // namespace client
|
| } // namespace aura
|
|
|