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/shadow_types.h" | 9 #include "ash/wm/shadow_types.h" |
10 #include "ui/aura/window_property.h" | 10 #include "ui/aura/window_property.h" |
11 #include "ui/ui_controls/ui_controls_aura.h" | 11 #include "ui/ui_controls/ui_controls_aura.h" |
12 | 12 |
13 // Property type for bool and ui::WindowShowState are | 13 // Property type for bool and ui::WindowShowState are |
14 // defined in aura. | 14 // defined in aura. |
15 DECLARE_WINDOW_PROPERTY_TYPE(ash::internal::AlwaysOnTopController*); | 15 DECLARE_WINDOW_PROPERTY_TYPE(ash::internal::AlwaysOnTopController*); |
16 DECLARE_WINDOW_PROPERTY_TYPE(ash::internal::ShadowType); | 16 DECLARE_WINDOW_PROPERTY_TYPE(ash::internal::ShadowType); |
17 DECLARE_WINDOW_PROPERTY_TYPE(ash::WindowPersistsAcrossAllWorkspacesType) | 17 DECLARE_WINDOW_PROPERTY_TYPE(ash::WindowPersistsAcrossAllWorkspacesType) |
18 DECLARE_WINDOW_PROPERTY_TYPE(ui_controls::UIControlsAura*) | 18 DECLARE_WINDOW_PROPERTY_TYPE(ui_controls::UIControlsAura*) |
19 DECLARE_WINDOW_PROPERTY_TYPE(ash::internal::RootWindowController*); | 19 DECLARE_WINDOW_PROPERTY_TYPE(ash::internal::RootWindowController*); |
20 | 20 |
21 namespace ash { | 21 namespace ash { |
22 namespace internal { | 22 namespace internal { |
23 DEFINE_OWNED_WINDOW_PROPERTY_KEY(ash::internal::AlwaysOnTopController, | 23 DEFINE_OWNED_WINDOW_PROPERTY_KEY(ash::internal::AlwaysOnTopController, |
24 kAlwaysOnTopControllerKey, | 24 kAlwaysOnTopControllerKey, |
25 NULL); | 25 NULL); |
26 DEFINE_WINDOW_PROPERTY_KEY( | 26 DEFINE_WINDOW_PROPERTY_KEY( |
27 bool, kChildWindowVisibilityChangesAnimatedKey, false); | 27 bool, kChildWindowVisibilityChangesAnimatedKey, false); |
| 28 DEFINE_WINDOW_PROPERTY_KEY(bool, kIgnoredByShelfKey, false); |
28 DEFINE_WINDOW_PROPERTY_KEY( | 29 DEFINE_WINDOW_PROPERTY_KEY( |
29 ui::WindowShowState, kRestoreShowStateKey, ui::SHOW_STATE_DEFAULT); | 30 ui::WindowShowState, kRestoreShowStateKey, ui::SHOW_STATE_DEFAULT); |
30 DEFINE_WINDOW_PROPERTY_KEY(RootWindowController*, | 31 DEFINE_WINDOW_PROPERTY_KEY(RootWindowController*, |
31 kRootWindowControllerKey, NULL); | 32 kRootWindowControllerKey, NULL); |
32 DEFINE_WINDOW_PROPERTY_KEY(ShadowType, kShadowTypeKey, SHADOW_TYPE_NONE); | 33 DEFINE_WINDOW_PROPERTY_KEY(ShadowType, kShadowTypeKey, SHADOW_TYPE_NONE); |
33 DEFINE_OWNED_WINDOW_PROPERTY_KEY(ui_controls::UIControlsAura, | 34 DEFINE_OWNED_WINDOW_PROPERTY_KEY(ui_controls::UIControlsAura, |
34 kUIControlsKey, | 35 kUIControlsKey, |
35 NULL); | 36 NULL); |
36 DEFINE_WINDOW_PROPERTY_KEY(bool, kUsesScreenCoordinatesKey, false); | 37 DEFINE_WINDOW_PROPERTY_KEY(bool, kUsesScreenCoordinatesKey, false); |
37 DEFINE_WINDOW_PROPERTY_KEY(ash::WindowPersistsAcrossAllWorkspacesType, | 38 DEFINE_WINDOW_PROPERTY_KEY(ash::WindowPersistsAcrossAllWorkspacesType, |
38 kWindowPersistsAcrossAllWorkspacesKey, | 39 kWindowPersistsAcrossAllWorkspacesKey, |
39 WINDOW_PERSISTS_ACROSS_ALL_WORKSPACES_VALUE_DEFAULT); | 40 WINDOW_PERSISTS_ACROSS_ALL_WORKSPACES_VALUE_DEFAULT); |
40 DEFINE_WINDOW_PROPERTY_KEY(bool, kWindowTrackedByWorkspaceKey, true); | 41 DEFINE_WINDOW_PROPERTY_KEY(bool, kWindowTrackedByWorkspaceKey, true); |
41 | 42 |
42 } // namespace internal | 43 } // namespace internal |
43 } // namespace ash | 44 } // namespace ash |
OLD | NEW |