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 "ui/aura/client/aura_constants.h" | 5 #include "ui/aura/client/aura_constants.h" |
6 | 6 |
7 #include "services/ui/public/interfaces/window_manager_constants.mojom.h" | 7 #include "services/ui/public/interfaces/window_manager_constants.mojom.h" |
8 #include "ui/base/class_property.h" | 8 #include "ui/base/class_property.h" |
9 #include "ui/gfx/geometry/rect.h" | 9 #include "ui/gfx/geometry/rect.h" |
10 | 10 |
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
49 DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(std::string, kNameKey, nullptr); | 49 DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(std::string, kNameKey, nullptr); |
50 DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(gfx::Size, kPreferredSize, nullptr); | 50 DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(gfx::Size, kPreferredSize, nullptr); |
51 DEFINE_UI_CLASS_PROPERTY_KEY( | 51 DEFINE_UI_CLASS_PROPERTY_KEY( |
52 ui::WindowShowState, kPreMinimizedShowStateKey, ui::SHOW_STATE_DEFAULT); | 52 ui::WindowShowState, kPreMinimizedShowStateKey, ui::SHOW_STATE_DEFAULT); |
53 DEFINE_UI_CLASS_PROPERTY_KEY( | 53 DEFINE_UI_CLASS_PROPERTY_KEY( |
54 ui::WindowShowState, kPreFullscreenShowStateKey, ui::SHOW_STATE_DEFAULT); | 54 ui::WindowShowState, kPreFullscreenShowStateKey, ui::SHOW_STATE_DEFAULT); |
55 DEFINE_UI_CLASS_PROPERTY_KEY(int32_t, | 55 DEFINE_UI_CLASS_PROPERTY_KEY(int32_t, |
56 kResizeBehaviorKey, | 56 kResizeBehaviorKey, |
57 ui::mojom::kResizeBehaviorCanResize); | 57 ui::mojom::kResizeBehaviorCanResize); |
58 DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(gfx::Rect, kRestoreBoundsKey, nullptr); | 58 DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(gfx::Rect, kRestoreBoundsKey, nullptr); |
| 59 DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(gfx::Rect, |
| 60 kVirtualKeyboardRestoreBoundsKey, |
| 61 nullptr); |
59 DEFINE_UI_CLASS_PROPERTY_KEY( | 62 DEFINE_UI_CLASS_PROPERTY_KEY( |
60 ui::WindowShowState, kShowStateKey, ui::SHOW_STATE_DEFAULT); | 63 ui::WindowShowState, kShowStateKey, ui::SHOW_STATE_DEFAULT); |
61 DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(base::string16, kTitleKey, nullptr); | 64 DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(base::string16, kTitleKey, nullptr); |
62 DEFINE_UI_CLASS_PROPERTY_KEY(int, kTopViewInset, 0); | 65 DEFINE_UI_CLASS_PROPERTY_KEY(int, kTopViewInset, 0); |
63 DEFINE_UI_CLASS_PROPERTY_KEY(SkColor, kTopViewColor, SK_ColorTRANSPARENT); | 66 DEFINE_UI_CLASS_PROPERTY_KEY(SkColor, kTopViewColor, SK_ColorTRANSPARENT); |
64 DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(gfx::ImageSkia, kWindowIconKey, nullptr); | 67 DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(gfx::ImageSkia, kWindowIconKey, nullptr); |
65 DEFINE_UI_CLASS_PROPERTY_KEY(ui::mojom::WindowType, | 68 DEFINE_UI_CLASS_PROPERTY_KEY(ui::mojom::WindowType, |
66 kWindowTypeKey, | 69 kWindowTypeKey, |
67 ui::mojom::WindowType::UNKNOWN); | 70 ui::mojom::WindowType::UNKNOWN); |
68 | 71 |
69 } // namespace client | 72 } // namespace client |
70 } // namespace aura | 73 } // namespace aura |
OLD | NEW |