| 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 #include "ui/ui_controls/ui_controls_aura.h" | 12 #include "ui/ui_controls/ui_controls_aura.h" |
| 13 | 13 |
| 14 DECLARE_WINDOW_PROPERTY_TYPE(ash::internal::AlwaysOnTopController*); | 14 DECLARE_WINDOW_PROPERTY_TYPE(ash::internal::AlwaysOnTopController*); |
| 15 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(ASH_EXPORT, ash::FramePainter*); | 15 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(ASH_EXPORT, ash::FramePainter*); |
| 16 DECLARE_WINDOW_PROPERTY_TYPE(ash::WindowPersistsAcrossAllWorkspacesType) | 16 DECLARE_WINDOW_PROPERTY_TYPE(ash::WindowPersistsAcrossAllWorkspacesType) |
| 17 DECLARE_WINDOW_PROPERTY_TYPE(ui_controls::UIControlsAura*) | 17 DECLARE_WINDOW_PROPERTY_TYPE(ui_controls::UIControlsAura*) |
| 18 DECLARE_WINDOW_PROPERTY_TYPE(ash::internal::RootWindowController*); | 18 DECLARE_WINDOW_PROPERTY_TYPE(ash::internal::RootWindowController*); |
| 19 | 19 |
| 20 namespace ash { | 20 namespace ash { |
| 21 namespace internal { | 21 namespace internal { |
| 22 DEFINE_OWNED_WINDOW_PROPERTY_KEY(ash::internal::AlwaysOnTopController, | 22 DEFINE_OWNED_WINDOW_PROPERTY_KEY(ash::internal::AlwaysOnTopController, |
| 23 kAlwaysOnTopControllerKey, | 23 kAlwaysOnTopControllerKey, |
| 24 NULL); | 24 NULL); |
| 25 DEFINE_WINDOW_PROPERTY_KEY(bool, kIgnoreSoloWindowPolicy, false); |
| 25 DEFINE_WINDOW_PROPERTY_KEY(bool, kIgnoredByShelfKey, false); | 26 DEFINE_WINDOW_PROPERTY_KEY(bool, kIgnoredByShelfKey, false); |
| 26 DEFINE_WINDOW_PROPERTY_KEY( | 27 DEFINE_WINDOW_PROPERTY_KEY( |
| 27 ui::WindowShowState, kRestoreShowStateKey, ui::SHOW_STATE_DEFAULT); | 28 ui::WindowShowState, kRestoreShowStateKey, ui::SHOW_STATE_DEFAULT); |
| 28 DEFINE_WINDOW_PROPERTY_KEY(RootWindowController*, | 29 DEFINE_WINDOW_PROPERTY_KEY(RootWindowController*, |
| 29 kRootWindowControllerKey, NULL); | 30 kRootWindowControllerKey, NULL); |
| 30 DEFINE_WINDOW_PROPERTY_KEY( | 31 DEFINE_WINDOW_PROPERTY_KEY( |
| 31 ash::FramePainter*, kSoloWindowFramePainterKey, NULL); | 32 ash::FramePainter*, kSoloWindowFramePainterKey, NULL); |
| 32 DEFINE_WINDOW_PROPERTY_KEY(bool, kStayInSameRootWindowKey, false); | 33 DEFINE_WINDOW_PROPERTY_KEY(bool, kStayInSameRootWindowKey, false); |
| 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(bool, kUserChangedWindowPositionOrSizeKey, false); | 38 DEFINE_WINDOW_PROPERTY_KEY(bool, kUserChangedWindowPositionOrSizeKey, false); |
| 38 DEFINE_OWNED_WINDOW_PROPERTY_KEY(gfx::Rect, | 39 DEFINE_OWNED_WINDOW_PROPERTY_KEY(gfx::Rect, |
| 39 kPreAutoManagedWindowBoundsKey, | 40 kPreAutoManagedWindowBoundsKey, |
| 40 NULL); | 41 NULL); |
| 41 DEFINE_WINDOW_PROPERTY_KEY(ash::WindowPersistsAcrossAllWorkspacesType, | 42 DEFINE_WINDOW_PROPERTY_KEY(ash::WindowPersistsAcrossAllWorkspacesType, |
| 42 kWindowPersistsAcrossAllWorkspacesKey, | 43 kWindowPersistsAcrossAllWorkspacesKey, |
| 43 WINDOW_PERSISTS_ACROSS_ALL_WORKSPACES_VALUE_DEFAULT); | 44 WINDOW_PERSISTS_ACROSS_ALL_WORKSPACES_VALUE_DEFAULT); |
| 44 DEFINE_WINDOW_PROPERTY_KEY(bool, kWindowPositionManagedKey, false); | 45 DEFINE_WINDOW_PROPERTY_KEY(bool, kWindowPositionManagedKey, false); |
| 45 DEFINE_WINDOW_PROPERTY_KEY(bool, kWindowRestoresToRestoreBounds, false); | 46 DEFINE_WINDOW_PROPERTY_KEY(bool, kWindowRestoresToRestoreBounds, false); |
| 46 DEFINE_WINDOW_PROPERTY_KEY(bool, kWindowTrackedByWorkspaceKey, true); | 47 DEFINE_WINDOW_PROPERTY_KEY(bool, kWindowTrackedByWorkspaceKey, true); |
| 47 | 48 |
| 48 } // namespace internal | 49 } // namespace internal |
| 49 } // namespace ash | 50 } // namespace ash |
| OLD | NEW |