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::internal::RootWindowController*); | 16 DECLARE_WINDOW_PROPERTY_TYPE(ash::internal::RootWindowController*); |
17 | 17 |
18 namespace ash { | 18 namespace ash { |
19 namespace internal { | 19 namespace internal { |
20 DEFINE_OWNED_WINDOW_PROPERTY_KEY(ash::internal::AlwaysOnTopController, | 20 DEFINE_OWNED_WINDOW_PROPERTY_KEY(ash::internal::AlwaysOnTopController, |
21 kAlwaysOnTopControllerKey, | 21 kAlwaysOnTopControllerKey, |
22 NULL); | 22 NULL); |
| 23 DEFINE_WINDOW_PROPERTY_KEY(bool, kCyclingThroughWorkspacesKey, false); |
23 DEFINE_WINDOW_PROPERTY_KEY(bool, kIgnoreSoloWindowFramePainterPolicy, false); | 24 DEFINE_WINDOW_PROPERTY_KEY(bool, kIgnoreSoloWindowFramePainterPolicy, false); |
24 DEFINE_WINDOW_PROPERTY_KEY(bool, kIgnoredByShelfKey, false); | 25 DEFINE_WINDOW_PROPERTY_KEY(bool, kIgnoredByShelfKey, false); |
25 DEFINE_WINDOW_PROPERTY_KEY(bool, kImmersiveModeKey, false); | 26 DEFINE_WINDOW_PROPERTY_KEY(bool, kImmersiveModeKey, false); |
26 DEFINE_WINDOW_PROPERTY_KEY(bool, kPanelAttachedKey, true); | 27 DEFINE_WINDOW_PROPERTY_KEY(bool, kPanelAttachedKey, true); |
27 DEFINE_WINDOW_PROPERTY_KEY( | 28 DEFINE_WINDOW_PROPERTY_KEY( |
28 ui::WindowShowState, kRestoreShowStateKey, ui::SHOW_STATE_DEFAULT); | 29 ui::WindowShowState, kRestoreShowStateKey, ui::SHOW_STATE_DEFAULT); |
29 DEFINE_WINDOW_PROPERTY_KEY(RootWindowController*, | 30 DEFINE_WINDOW_PROPERTY_KEY(RootWindowController*, |
30 kRootWindowControllerKey, NULL); | 31 kRootWindowControllerKey, NULL); |
31 DEFINE_WINDOW_PROPERTY_KEY( | 32 DEFINE_WINDOW_PROPERTY_KEY( |
32 ash::FramePainter*, kSoloWindowFramePainterKey, NULL); | 33 ash::FramePainter*, kSoloWindowFramePainterKey, NULL); |
33 DEFINE_WINDOW_PROPERTY_KEY(bool, kStayInSameRootWindowKey, false); | 34 DEFINE_WINDOW_PROPERTY_KEY(bool, kStayInSameRootWindowKey, false); |
34 DEFINE_WINDOW_PROPERTY_KEY(bool, kUsesScreenCoordinatesKey, false); | 35 DEFINE_WINDOW_PROPERTY_KEY(bool, kUsesScreenCoordinatesKey, false); |
35 DEFINE_WINDOW_PROPERTY_KEY(bool, kUserChangedWindowPositionOrSizeKey, false); | 36 DEFINE_WINDOW_PROPERTY_KEY(bool, kUserChangedWindowPositionOrSizeKey, false); |
36 DEFINE_OWNED_WINDOW_PROPERTY_KEY(gfx::Rect, | 37 DEFINE_OWNED_WINDOW_PROPERTY_KEY(gfx::Rect, |
37 kPreAutoManagedWindowBoundsKey, | 38 kPreAutoManagedWindowBoundsKey, |
38 NULL); | 39 NULL); |
39 DEFINE_WINDOW_PROPERTY_KEY(ash::WindowPersistsAcrossAllWorkspacesType, | 40 DEFINE_WINDOW_PROPERTY_KEY(ash::WindowPersistsAcrossAllWorkspacesType, |
40 kWindowPersistsAcrossAllWorkspacesKey, | 41 kWindowPersistsAcrossAllWorkspacesKey, |
41 WINDOW_PERSISTS_ACROSS_ALL_WORKSPACES_VALUE_DEFAULT); | 42 WINDOW_PERSISTS_ACROSS_ALL_WORKSPACES_VALUE_DEFAULT); |
42 DEFINE_WINDOW_PROPERTY_KEY(bool, kWindowPositionManagedKey, false); | 43 DEFINE_WINDOW_PROPERTY_KEY(bool, kWindowPositionManagedKey, false); |
43 DEFINE_WINDOW_PROPERTY_KEY(bool, kWindowRestoresToRestoreBounds, false); | 44 DEFINE_WINDOW_PROPERTY_KEY(bool, kWindowRestoresToRestoreBounds, false); |
44 DEFINE_WINDOW_PROPERTY_KEY(bool, kWindowTrackedByWorkspaceKey, true); | 45 DEFINE_WINDOW_PROPERTY_KEY(bool, kWindowTrackedByWorkspaceKey, true); |
45 | 46 |
46 } // namespace internal | 47 } // namespace internal |
47 } // namespace ash | 48 } // namespace ash |
OLD | NEW |