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_dimmer.h" | |
7 #include "ash/common/wm/window_state.h" | 8 #include "ash/common/wm/window_state.h" |
8 | 9 |
10 DECLARE_UI_CLASS_PROPERTY_TYPE(ash::WindowDimmer*); | |
James Cook
2017/03/09 18:39:27
Question for my knowledge: Why can't the DECLARE g
sky
2017/03/09 20:39:04
Two places used this type, so rather than have it
| |
9 DECLARE_UI_CLASS_PROPERTY_TYPE(ash::wm::WindowState*); | 11 DECLARE_UI_CLASS_PROPERTY_TYPE(ash::wm::WindowState*); |
10 DECLARE_EXPORTED_UI_CLASS_PROPERTY_TYPE(ASH_EXPORT, ash::WidgetCreationType); | 12 DECLARE_EXPORTED_UI_CLASS_PROPERTY_TYPE(ASH_EXPORT, ash::WidgetCreationType); |
11 | 13 |
12 namespace ash { | 14 namespace ash { |
13 | 15 |
14 DEFINE_UI_CLASS_PROPERTY_KEY(bool, kLockedToRootKey, false); | 16 DEFINE_UI_CLASS_PROPERTY_KEY(bool, kLockedToRootKey, false); |
15 | 17 |
16 DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(gfx::Rect, kRestoreBoundsOverrideKey, NULL); | 18 DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(gfx::Rect, kRestoreBoundsOverrideKey, NULL); |
17 | 19 |
18 DEFINE_UI_CLASS_PROPERTY_KEY(ui::WindowShowState, | 20 DEFINE_UI_CLASS_PROPERTY_KEY(ui::WindowShowState, |
19 kRestoreShowStateOverrideKey, | 21 kRestoreShowStateOverrideKey, |
20 ui::SHOW_STATE_DEFAULT); | 22 ui::SHOW_STATE_DEFAULT); |
21 | 23 |
22 DEFINE_UI_CLASS_PROPERTY_KEY(ShelfID, kShelfIDKey, kInvalidShelfID); | 24 DEFINE_UI_CLASS_PROPERTY_KEY(ShelfID, kShelfIDKey, kInvalidShelfID); |
23 | 25 |
24 DEFINE_UI_CLASS_PROPERTY_KEY(bool, kSnapChildrenToPixelBoundary, false); | 26 DEFINE_UI_CLASS_PROPERTY_KEY(bool, kSnapChildrenToPixelBoundary, false); |
25 | 27 |
26 DEFINE_UI_CLASS_PROPERTY_KEY(bool, kUsesScreenCoordinatesKey, false); | 28 DEFINE_UI_CLASS_PROPERTY_KEY(bool, kUsesScreenCoordinatesKey, false); |
27 | 29 |
28 DEFINE_UI_CLASS_PROPERTY_KEY(WidgetCreationType, | 30 DEFINE_UI_CLASS_PROPERTY_KEY(WidgetCreationType, |
29 kWidgetCreationTypeKey, | 31 kWidgetCreationTypeKey, |
30 WidgetCreationType::INTERNAL); | 32 WidgetCreationType::INTERNAL); |
31 | 33 |
32 DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(ash::wm::WindowState, kWindowStateKey, NULL); | 34 DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(ash::wm::WindowState, kWindowStateKey, NULL); |
33 | 35 |
34 } // namespace ash | 36 } // namespace ash |
OLD | NEW |