| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ash/wm/window_properties.h" | 5 #include "ash/wm/window_properties.h" |
| 6 | 6 |
| 7 #include "ash/root_window_controller.h" | 7 #include "ash/root_window_controller.h" |
| 8 #include "ash/wm/always_on_top_controller.h" | 8 #include "ash/wm/always_on_top_controller.h" |
| 9 #include "ash/wm/frame_painter.h" | 9 #include "ash/wm/frame_painter.h" |
| 10 #include "ui/aura/window_property.h" | 10 #include "ui/aura/window_property.h" |
| 11 #include "ui/gfx/rect.h" | 11 #include "ui/gfx/rect.h" |
| 12 | 12 |
| 13 DECLARE_WINDOW_PROPERTY_TYPE(ash::internal::AlwaysOnTopController*); | 13 DECLARE_WINDOW_PROPERTY_TYPE(ash::internal::AlwaysOnTopController*); |
| 14 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(ASH_EXPORT, ash::FramePainter*); | 14 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(ASH_EXPORT, ash::FramePainter*); |
| 15 DECLARE_WINDOW_PROPERTY_TYPE(ash::WindowPersistsAcrossAllWorkspacesType) | 15 DECLARE_WINDOW_PROPERTY_TYPE(ash::WindowPersistsAcrossAllWorkspacesType); |
| 16 DECLARE_WINDOW_PROPERTY_TYPE(ash::DockEdge); |
| 16 DECLARE_WINDOW_PROPERTY_TYPE(ash::internal::RootWindowController*); | 17 DECLARE_WINDOW_PROPERTY_TYPE(ash::internal::RootWindowController*); |
| 17 | 18 |
| 18 namespace ash { | 19 namespace ash { |
| 19 namespace internal { | 20 namespace internal { |
| 20 DEFINE_OWNED_WINDOW_PROPERTY_KEY(ash::internal::AlwaysOnTopController, | 21 DEFINE_OWNED_WINDOW_PROPERTY_KEY(ash::internal::AlwaysOnTopController, |
| 21 kAlwaysOnTopControllerKey, | 22 kAlwaysOnTopControllerKey, |
| 22 NULL); | 23 NULL); |
| 23 DEFINE_WINDOW_PROPERTY_KEY(bool, kContinueDragAfterReparent, false); | 24 DEFINE_WINDOW_PROPERTY_KEY(bool, kContinueDragAfterReparent, false); |
| 24 DEFINE_WINDOW_PROPERTY_KEY(bool, kCyclingThroughWorkspacesKey, false); | 25 DEFINE_WINDOW_PROPERTY_KEY(bool, kCyclingThroughWorkspacesKey, false); |
| 25 DEFINE_WINDOW_PROPERTY_KEY(bool, kFullscreenUsesMinimalChromeKey, false); | 26 DEFINE_WINDOW_PROPERTY_KEY(bool, kFullscreenUsesMinimalChromeKey, false); |
| 26 DEFINE_WINDOW_PROPERTY_KEY(bool, kIgnoreSoloWindowFramePainterPolicy, false); | 27 DEFINE_WINDOW_PROPERTY_KEY(bool, kIgnoreSoloWindowFramePainterPolicy, false); |
| 27 DEFINE_WINDOW_PROPERTY_KEY(bool, kIgnoredByShelfKey, false); | 28 DEFINE_WINDOW_PROPERTY_KEY(bool, kIgnoredByShelfKey, false); |
| 28 DEFINE_WINDOW_PROPERTY_KEY(bool, kPanelAttachedKey, true); | 29 DEFINE_WINDOW_PROPERTY_KEY(bool, kPanelAttachedKey, true); |
| 29 DEFINE_WINDOW_PROPERTY_KEY(RootWindowController*, | 30 DEFINE_WINDOW_PROPERTY_KEY(RootWindowController*, |
| 30 kRootWindowControllerKey, NULL); | 31 kRootWindowControllerKey, NULL); |
| 31 DEFINE_WINDOW_PROPERTY_KEY(bool, kSoloWindowHeaderKey, false); | 32 DEFINE_WINDOW_PROPERTY_KEY(bool, kSoloWindowHeaderKey, false); |
| 32 DEFINE_WINDOW_PROPERTY_KEY(bool, kStayInSameRootWindowKey, false); | 33 DEFINE_WINDOW_PROPERTY_KEY(bool, kStayInSameRootWindowKey, false); |
| 33 DEFINE_WINDOW_PROPERTY_KEY(bool, kUsesScreenCoordinatesKey, false); | 34 DEFINE_WINDOW_PROPERTY_KEY(bool, kUsesScreenCoordinatesKey, false); |
| 34 DEFINE_WINDOW_PROPERTY_KEY(bool, kUserChangedWindowPositionOrSizeKey, false); | 35 DEFINE_WINDOW_PROPERTY_KEY(bool, kUserChangedWindowPositionOrSizeKey, false); |
| 35 DEFINE_OWNED_WINDOW_PROPERTY_KEY(gfx::Rect, | 36 DEFINE_OWNED_WINDOW_PROPERTY_KEY(gfx::Rect, |
| 36 kPreAutoManagedWindowBoundsKey, | 37 kPreAutoManagedWindowBoundsKey, |
| 37 NULL); | 38 NULL); |
| 38 DEFINE_WINDOW_PROPERTY_KEY(ash::WindowPersistsAcrossAllWorkspacesType, | 39 DEFINE_WINDOW_PROPERTY_KEY(ash::WindowPersistsAcrossAllWorkspacesType, |
| 39 kWindowPersistsAcrossAllWorkspacesKey, | 40 kWindowPersistsAcrossAllWorkspacesKey, |
| 40 WINDOW_PERSISTS_ACROSS_ALL_WORKSPACES_VALUE_DEFAULT); | 41 WINDOW_PERSISTS_ACROSS_ALL_WORKSPACES_VALUE_DEFAULT); |
| 41 DEFINE_WINDOW_PROPERTY_KEY(bool, kWindowPositionManagedKey, false); | 42 DEFINE_WINDOW_PROPERTY_KEY(bool, kWindowPositionManagedKey, false); |
| 42 DEFINE_WINDOW_PROPERTY_KEY(bool, kWindowRestoresToRestoreBounds, false); | 43 DEFINE_WINDOW_PROPERTY_KEY(bool, kWindowRestoresToRestoreBounds, false); |
| 44 DEFINE_WINDOW_PROPERTY_KEY(DockEdge, kDockEdge, DOCK_EDGE_NONE); |
| 43 DEFINE_WINDOW_PROPERTY_KEY(bool, kWindowTrackedByWorkspaceKey, true); | 45 DEFINE_WINDOW_PROPERTY_KEY(bool, kWindowTrackedByWorkspaceKey, true); |
| 44 | 46 |
| 45 } // namespace internal | 47 } // namespace internal |
| 46 } // namespace ash | 48 } // namespace ash |
| OLD | NEW |