| 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 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 51 DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(std::string, kNameKey, nullptr); | 51 DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(std::string, kNameKey, nullptr); |
| 52 DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(gfx::Size, kPreferredSize, nullptr); | 52 DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(gfx::Size, kPreferredSize, nullptr); |
| 53 DEFINE_UI_CLASS_PROPERTY_KEY( | 53 DEFINE_UI_CLASS_PROPERTY_KEY( |
| 54 ui::WindowShowState, kPreMinimizedShowStateKey, ui::SHOW_STATE_DEFAULT); | 54 ui::WindowShowState, kPreMinimizedShowStateKey, ui::SHOW_STATE_DEFAULT); |
| 55 DEFINE_UI_CLASS_PROPERTY_KEY( | 55 DEFINE_UI_CLASS_PROPERTY_KEY( |
| 56 ui::WindowShowState, kPreFullscreenShowStateKey, ui::SHOW_STATE_DEFAULT); | 56 ui::WindowShowState, kPreFullscreenShowStateKey, ui::SHOW_STATE_DEFAULT); |
| 57 DEFINE_UI_CLASS_PROPERTY_KEY(int32_t, | 57 DEFINE_UI_CLASS_PROPERTY_KEY(int32_t, |
| 58 kResizeBehaviorKey, | 58 kResizeBehaviorKey, |
| 59 ui::mojom::kResizeBehaviorCanResize); | 59 ui::mojom::kResizeBehaviorCanResize); |
| 60 DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(gfx::Rect, kRestoreBoundsKey, nullptr); | 60 DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(gfx::Rect, kRestoreBoundsKey, nullptr); |
| 61 DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(gfx::Rect, |
| 62 kVirtualKeyboardRestoreBoundsKey, |
| 63 nullptr); |
| 61 DEFINE_UI_CLASS_PROPERTY_KEY( | 64 DEFINE_UI_CLASS_PROPERTY_KEY( |
| 62 ui::WindowShowState, kShowStateKey, ui::SHOW_STATE_DEFAULT); | 65 ui::WindowShowState, kShowStateKey, ui::SHOW_STATE_DEFAULT); |
| 63 DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(base::string16, kTitleKey, nullptr); | 66 DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(base::string16, kTitleKey, nullptr); |
| 64 DEFINE_UI_CLASS_PROPERTY_KEY(int, kTopViewInset, 0); | 67 DEFINE_UI_CLASS_PROPERTY_KEY(int, kTopViewInset, 0); |
| 65 DEFINE_UI_CLASS_PROPERTY_KEY(SkColor, kTopViewColor, SK_ColorTRANSPARENT); | 68 DEFINE_UI_CLASS_PROPERTY_KEY(SkColor, kTopViewColor, SK_ColorTRANSPARENT); |
| 66 DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(gfx::ImageSkia, kWindowIconKey, nullptr); | 69 DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(gfx::ImageSkia, kWindowIconKey, nullptr); |
| 67 DEFINE_UI_CLASS_PROPERTY_KEY(ui::mojom::WindowType, | 70 DEFINE_UI_CLASS_PROPERTY_KEY(ui::mojom::WindowType, |
| 68 kWindowTypeKey, | 71 kWindowTypeKey, |
| 69 ui::mojom::WindowType::UNKNOWN); | 72 ui::mojom::WindowType::UNKNOWN); |
| 70 | 73 |
| 71 } // namespace client | 74 } // namespace client |
| 72 } // namespace aura | 75 } // namespace aura |
| OLD | NEW |