| Index: ash/wm/window_properties.cc
|
| diff --git a/ash/wm/window_properties.cc b/ash/wm/window_properties.cc
|
| index 4df599a7cd8c1cfedfa9ef6cb6fe0d847f830754..dbb3fe893eeb1dd8c802929d9102188b4ec2b699 100644
|
| --- a/ash/wm/window_properties.cc
|
| +++ b/ash/wm/window_properties.cc
|
| @@ -5,14 +5,18 @@
|
| #include "ash/wm/window_properties.h"
|
|
|
| #include "ash/wm/window_state.h"
|
| +#include "ash/wm/wm_types.h"
|
| #include "ui/aura/window_property.h"
|
|
|
| DECLARE_WINDOW_PROPERTY_TYPE(ash::wm::WindowState*);
|
| +DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(ASH_EXPORT, ash::wm::FullscreenType);
|
|
|
| namespace ash {
|
| namespace internal {
|
| DEFINE_WINDOW_PROPERTY_KEY(bool, kAnimateToFullscreenKey, true);
|
| -DEFINE_WINDOW_PROPERTY_KEY(bool, kFullscreenUsesMinimalChromeKey, false);
|
| +DEFINE_WINDOW_PROPERTY_KEY(wm::FullscreenType,
|
| + kFullscreenTypeKey,
|
| + wm::FULLSCREEN_TYPE_OTHER);
|
| DEFINE_WINDOW_PROPERTY_KEY(bool, kStayInSameRootWindowKey, false);
|
| DEFINE_WINDOW_PROPERTY_KEY(bool, kUsesScreenCoordinatesKey, false);
|
| DEFINE_OWNED_WINDOW_PROPERTY_KEY(wm::WindowState,
|
|
|