Index: ash/wm/window_properties.cc |
diff --git a/ash/wm/window_properties.cc b/ash/wm/window_properties.cc |
index 506d8d6ac48b88026d76ed2c77bcbea8d4c38b62..a4a9a902f0699c8cc0c43024918aab3a9bc74dac 100644 |
--- a/ash/wm/window_properties.cc |
+++ b/ash/wm/window_properties.cc |
@@ -7,10 +7,23 @@ |
#include "ash/wm/shadow_types.h" |
#include "ui/aura/window_property.h" |
+// Property type for bool and ui::WindowShowState are |
+// defined in aura. |
DECLARE_WINDOW_PROPERTY_TYPE(ash::internal::ShadowType); |
+DECLARE_WINDOW_PROPERTY_TYPE(ash::WindowPersistsAcrossAllWorkspacesType) |
namespace ash { |
namespace internal { |
+ |
+DEFINE_WINDOW_PROPERTY_KEY( |
+ bool, kChildWindowVisibilityChangesAnimatedKey, false); |
+DEFINE_WINDOW_PROPERTY_KEY( |
+ ui::WindowShowState, kRestoreShowStateKey, ui::SHOW_STATE_DEFAULT); |
DEFINE_WINDOW_PROPERTY_KEY(ShadowType, kShadowTypeKey, SHADOW_TYPE_NONE); |
+DEFINE_WINDOW_PROPERTY_KEY(ash::WindowPersistsAcrossAllWorkspacesType, |
+ kWindowPersistsAcrossAllWorkspacesKey, |
+ WINDOW_PERSISTS_ACROSS_ALL_WORKSPACES_VALUE_DEFAULT); |
+DEFINE_WINDOW_PROPERTY_KEY(bool, kWindowTrackedByWorkspaceKey, true); |
+ |
} // namespace internal |
} // namespace ash |