| 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/common/wm/window_state.h" | 7 #include "ash/common/wm/window_state.h" |
| 8 #include "ui/base/class_property.h" | |
| 9 | 8 |
| 10 DECLARE_UI_CLASS_PROPERTY_TYPE(ash::wm::WindowState*); | 9 DECLARE_UI_CLASS_PROPERTY_TYPE(ash::wm::WindowState*); |
| 11 DECLARE_EXPORTED_UI_CLASS_PROPERTY_TYPE(ASH_EXPORT, ash::WidgetCreationType); | 10 DECLARE_EXPORTED_UI_CLASS_PROPERTY_TYPE(ASH_EXPORT, ash::WidgetCreationType); |
| 12 | 11 |
| 13 namespace ash { | 12 namespace ash { |
| 14 | 13 |
| 15 DEFINE_UI_CLASS_PROPERTY_KEY(bool, kLockedToRootKey, false); | 14 DEFINE_UI_CLASS_PROPERTY_KEY(bool, kLockedToRootKey, false); |
| 16 | 15 |
| 17 DEFINE_UI_CLASS_PROPERTY_KEY(bool, kPanelAttachedKey, true); | |
| 18 | |
| 19 DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(gfx::Rect, kRestoreBoundsOverrideKey, NULL); | 16 DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(gfx::Rect, kRestoreBoundsOverrideKey, NULL); |
| 20 | 17 |
| 21 DEFINE_UI_CLASS_PROPERTY_KEY(ui::WindowShowState, | 18 DEFINE_UI_CLASS_PROPERTY_KEY(ui::WindowShowState, |
| 22 kRestoreShowStateOverrideKey, | 19 kRestoreShowStateOverrideKey, |
| 23 ui::SHOW_STATE_DEFAULT); | 20 ui::SHOW_STATE_DEFAULT); |
| 24 | 21 |
| 25 DEFINE_UI_CLASS_PROPERTY_KEY(ShelfID, kShelfIDKey, kInvalidShelfID); | 22 DEFINE_UI_CLASS_PROPERTY_KEY(ShelfID, kShelfIDKey, kInvalidShelfID); |
| 26 | 23 |
| 27 DEFINE_UI_CLASS_PROPERTY_KEY(int32_t, kShelfItemTypeKey, TYPE_UNDEFINED); | |
| 28 | |
| 29 DEFINE_UI_CLASS_PROPERTY_KEY(bool, kSnapChildrenToPixelBoundary, false); | 24 DEFINE_UI_CLASS_PROPERTY_KEY(bool, kSnapChildrenToPixelBoundary, false); |
| 30 | 25 |
| 31 DEFINE_UI_CLASS_PROPERTY_KEY(bool, kUsesScreenCoordinatesKey, false); | 26 DEFINE_UI_CLASS_PROPERTY_KEY(bool, kUsesScreenCoordinatesKey, false); |
| 32 | 27 |
| 33 DEFINE_UI_CLASS_PROPERTY_KEY(WidgetCreationType, | 28 DEFINE_UI_CLASS_PROPERTY_KEY(WidgetCreationType, |
| 34 kWidgetCreationTypeKey, | 29 kWidgetCreationTypeKey, |
| 35 WidgetCreationType::INTERNAL); | 30 WidgetCreationType::INTERNAL); |
| 36 | 31 |
| 37 DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(ash::wm::WindowState, kWindowStateKey, NULL); | 32 DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(ash::wm::WindowState, kWindowStateKey, NULL); |
| 38 | 33 |
| 39 } // namespace ash | 34 } // namespace ash |
| OLD | NEW |