| 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/frame_painter.h" | 8 #include "ash/wm/frame_painter.h" |
| 9 #include "ui/aura/window_property.h" | 9 #include "ui/aura/window_property.h" |
| 10 #include "ui/gfx/rect.h" | 10 #include "ui/gfx/rect.h" |
| 11 | 11 |
| 12 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(ASH_EXPORT, ash::FramePainter*); | |
| 13 DECLARE_WINDOW_PROPERTY_TYPE(ash::internal::RootWindowController*); | |
| 14 | |
| 15 namespace ash { | 12 namespace ash { |
| 16 namespace internal { | 13 namespace internal { |
| 17 DEFINE_WINDOW_PROPERTY_KEY(bool, kAnimateToFullscreenKey, true); | 14 DEFINE_WINDOW_PROPERTY_KEY(bool, kAnimateToFullscreenKey, true); |
| 18 DEFINE_WINDOW_PROPERTY_KEY(bool, kContinueDragAfterReparent, false); | 15 DEFINE_WINDOW_PROPERTY_KEY(bool, kContinueDragAfterReparent, false); |
| 19 DEFINE_WINDOW_PROPERTY_KEY(bool, kFullscreenUsesMinimalChromeKey, false); | 16 DEFINE_WINDOW_PROPERTY_KEY(bool, kFullscreenUsesMinimalChromeKey, false); |
| 20 DEFINE_WINDOW_PROPERTY_KEY(bool, kIgnoreSoloWindowFramePainterPolicy, false); | 17 DEFINE_WINDOW_PROPERTY_KEY(bool, kIgnoreSoloWindowFramePainterPolicy, false); |
| 21 DEFINE_WINDOW_PROPERTY_KEY(bool, kIgnoredByShelfKey, false); | 18 DEFINE_WINDOW_PROPERTY_KEY(bool, kIgnoredByShelfKey, false); |
| 22 DEFINE_WINDOW_PROPERTY_KEY(bool, kPanelAttachedKey, true); | 19 DEFINE_WINDOW_PROPERTY_KEY(bool, kPanelAttachedKey, true); |
| 23 DEFINE_WINDOW_PROPERTY_KEY(RootWindowController*, | |
| 24 kRootWindowControllerKey, NULL); | |
| 25 DEFINE_WINDOW_PROPERTY_KEY(bool, kSoloWindowHeaderKey, false); | |
| 26 DEFINE_WINDOW_PROPERTY_KEY(bool, kStayInSameRootWindowKey, false); | 20 DEFINE_WINDOW_PROPERTY_KEY(bool, kStayInSameRootWindowKey, false); |
| 27 DEFINE_WINDOW_PROPERTY_KEY(bool, kUsesScreenCoordinatesKey, false); | 21 DEFINE_WINDOW_PROPERTY_KEY(bool, kUsesScreenCoordinatesKey, false); |
| 28 DEFINE_WINDOW_PROPERTY_KEY(bool, kUserChangedWindowPositionOrSizeKey, false); | 22 DEFINE_WINDOW_PROPERTY_KEY(bool, kUserChangedWindowPositionOrSizeKey, false); |
| 29 DEFINE_OWNED_WINDOW_PROPERTY_KEY(gfx::Rect, | 23 DEFINE_OWNED_WINDOW_PROPERTY_KEY(gfx::Rect, |
| 30 kPreAutoManagedWindowBoundsKey, | 24 kPreAutoManagedWindowBoundsKey, |
| 31 NULL); | 25 NULL); |
| 32 DEFINE_WINDOW_PROPERTY_KEY(bool, kWindowPositionManagedKey, false); | 26 DEFINE_WINDOW_PROPERTY_KEY(bool, kWindowPositionManagedKey, false); |
| 33 DEFINE_WINDOW_PROPERTY_KEY(bool, kWindowRestoresToRestoreBounds, false); | 27 DEFINE_WINDOW_PROPERTY_KEY(bool, kWindowRestoresToRestoreBounds, false); |
| 34 DEFINE_WINDOW_PROPERTY_KEY(bool, kWindowTrackedByWorkspaceKey, true); | 28 DEFINE_WINDOW_PROPERTY_KEY(bool, kWindowTrackedByWorkspaceKey, true); |
| 35 | 29 |
| 36 } // namespace internal | 30 } // namespace internal |
| 37 } // namespace ash | 31 } // namespace ash |
| OLD | NEW |