| Index: ash/wm/window_properties.cc
|
| diff --git a/ash/wm/window_properties.cc b/ash/wm/window_properties.cc
|
| index 64d55a77609786ebcf7e9b15b30e6914c1899aa8..35aadc3acc805b89b87e9481f74ce2af11b015d9 100644
|
| --- a/ash/wm/window_properties.cc
|
| +++ b/ash/wm/window_properties.cc
|
| @@ -12,7 +12,8 @@
|
|
|
| DECLARE_WINDOW_PROPERTY_TYPE(ash::internal::AlwaysOnTopController*);
|
| DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(ASH_EXPORT, ash::FramePainter*);
|
| -DECLARE_WINDOW_PROPERTY_TYPE(ash::WindowPersistsAcrossAllWorkspacesType)
|
| +DECLARE_WINDOW_PROPERTY_TYPE(ash::WindowPersistsAcrossAllWorkspacesType);
|
| +DECLARE_WINDOW_PROPERTY_TYPE(ash::DockedEdge);
|
| DECLARE_WINDOW_PROPERTY_TYPE(ash::internal::RootWindowController*);
|
|
|
| namespace ash {
|
| @@ -40,6 +41,7 @@ DEFINE_WINDOW_PROPERTY_KEY(ash::WindowPersistsAcrossAllWorkspacesType,
|
| WINDOW_PERSISTS_ACROSS_ALL_WORKSPACES_VALUE_DEFAULT);
|
| DEFINE_WINDOW_PROPERTY_KEY(bool, kWindowPositionManagedKey, false);
|
| DEFINE_WINDOW_PROPERTY_KEY(bool, kWindowRestoresToRestoreBounds, false);
|
| +DEFINE_WINDOW_PROPERTY_KEY(DockedEdge, kDockEdge, DOCKED_EDGE_NONE);
|
| DEFINE_WINDOW_PROPERTY_KEY(bool, kWindowTrackedByWorkspaceKey, true);
|
|
|
| } // namespace internal
|
|
|