| 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 "ash/wm/shadow_types.h" | 10 #include "ash/wm/shadow_types.h" |
| 11 #include "ui/aura/window_property.h" | 11 #include "ui/aura/window_property.h" |
| 12 #include "ui/ui_controls/ui_controls_aura.h" | 12 #include "ui/ui_controls/ui_controls_aura.h" |
| 13 | 13 |
| 14 // Property type for bool and ui::WindowShowState are | 14 // Property type for bool and ui::WindowShowState are |
| 15 // defined in aura. | 15 // defined in aura. |
| 16 DECLARE_WINDOW_PROPERTY_TYPE(ash::internal::AlwaysOnTopController*); | 16 DECLARE_WINDOW_PROPERTY_TYPE(ash::internal::AlwaysOnTopController*); |
| 17 DECLARE_WINDOW_PROPERTY_TYPE(ash::internal::ShadowType); | 17 DECLARE_WINDOW_PROPERTY_TYPE(ash::internal::ShadowType); |
| 18 DECLARE_WINDOW_PROPERTY_TYPE(ash::FramePainter*); | 18 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(ASH_EXPORT, ash::FramePainter*); |
| 19 DECLARE_WINDOW_PROPERTY_TYPE(ash::WindowPersistsAcrossAllWorkspacesType) | 19 DECLARE_WINDOW_PROPERTY_TYPE(ash::WindowPersistsAcrossAllWorkspacesType) |
| 20 DECLARE_WINDOW_PROPERTY_TYPE(ui_controls::UIControlsAura*) | 20 DECLARE_WINDOW_PROPERTY_TYPE(ui_controls::UIControlsAura*) |
| 21 DECLARE_WINDOW_PROPERTY_TYPE(ash::internal::RootWindowController*); | 21 DECLARE_WINDOW_PROPERTY_TYPE(ash::internal::RootWindowController*); |
| 22 | 22 |
| 23 namespace ash { | 23 namespace ash { |
| 24 namespace internal { | 24 namespace internal { |
| 25 DEFINE_OWNED_WINDOW_PROPERTY_KEY(ash::internal::AlwaysOnTopController, | 25 DEFINE_OWNED_WINDOW_PROPERTY_KEY(ash::internal::AlwaysOnTopController, |
| 26 kAlwaysOnTopControllerKey, | 26 kAlwaysOnTopControllerKey, |
| 27 NULL); | 27 NULL); |
| 28 DEFINE_WINDOW_PROPERTY_KEY( | 28 DEFINE_WINDOW_PROPERTY_KEY( |
| (...skipping 11 matching lines...) Expand all Loading... |
| 40 kUIControlsKey, | 40 kUIControlsKey, |
| 41 NULL); | 41 NULL); |
| 42 DEFINE_WINDOW_PROPERTY_KEY(bool, kUsesScreenCoordinatesKey, false); | 42 DEFINE_WINDOW_PROPERTY_KEY(bool, kUsesScreenCoordinatesKey, false); |
| 43 DEFINE_WINDOW_PROPERTY_KEY(ash::WindowPersistsAcrossAllWorkspacesType, | 43 DEFINE_WINDOW_PROPERTY_KEY(ash::WindowPersistsAcrossAllWorkspacesType, |
| 44 kWindowPersistsAcrossAllWorkspacesKey, | 44 kWindowPersistsAcrossAllWorkspacesKey, |
| 45 WINDOW_PERSISTS_ACROSS_ALL_WORKSPACES_VALUE_DEFAULT); | 45 WINDOW_PERSISTS_ACROSS_ALL_WORKSPACES_VALUE_DEFAULT); |
| 46 DEFINE_WINDOW_PROPERTY_KEY(bool, kWindowTrackedByWorkspaceKey, true); | 46 DEFINE_WINDOW_PROPERTY_KEY(bool, kWindowTrackedByWorkspaceKey, true); |
| 47 | 47 |
| 48 } // namespace internal | 48 } // namespace internal |
| 49 } // namespace ash | 49 } // namespace ash |
| OLD | NEW |