| 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/aura/window_property.h" | 8 #include "ui/aura/window_property.h" |
| 9 #include "ui/gfx/geometry/rect.h" | 9 #include "ui/gfx/geometry/rect.h" |
| 10 | 10 |
| (...skipping 27 matching lines...) Expand all Loading... |
| 38 DEFINE_WINDOW_PROPERTY_KEY(bool, kExcludeFromMruKey, false); | 38 DEFINE_WINDOW_PROPERTY_KEY(bool, kExcludeFromMruKey, false); |
| 39 DEFINE_WINDOW_PROPERTY_KEY(bool, kMirroringEnabledKey, false); | 39 DEFINE_WINDOW_PROPERTY_KEY(bool, kMirroringEnabledKey, false); |
| 40 DEFINE_WINDOW_PROPERTY_KEY(Window*, kHostWindowKey, nullptr); | 40 DEFINE_WINDOW_PROPERTY_KEY(Window*, kHostWindowKey, nullptr); |
| 41 DEFINE_WINDOW_PROPERTY_KEY(ui::ModalType, kModalKey, ui::MODAL_TYPE_NONE); | 41 DEFINE_WINDOW_PROPERTY_KEY(ui::ModalType, kModalKey, ui::MODAL_TYPE_NONE); |
| 42 DEFINE_OWNED_WINDOW_PROPERTY_KEY(std::string, kNameKey, nullptr); | 42 DEFINE_OWNED_WINDOW_PROPERTY_KEY(std::string, kNameKey, nullptr); |
| 43 DEFINE_OWNED_WINDOW_PROPERTY_KEY(gfx::Size, kPreferredSize, nullptr); | 43 DEFINE_OWNED_WINDOW_PROPERTY_KEY(gfx::Size, kPreferredSize, nullptr); |
| 44 DEFINE_WINDOW_PROPERTY_KEY(int32_t, | 44 DEFINE_WINDOW_PROPERTY_KEY(int32_t, |
| 45 kResizeBehaviorKey, | 45 kResizeBehaviorKey, |
| 46 ui::mojom::kResizeBehaviorCanResize); | 46 ui::mojom::kResizeBehaviorCanResize); |
| 47 DEFINE_OWNED_WINDOW_PROPERTY_KEY(gfx::Rect, kRestoreBoundsKey, nullptr); | 47 DEFINE_OWNED_WINDOW_PROPERTY_KEY(gfx::Rect, kRestoreBoundsKey, nullptr); |
| 48 DEFINE_OWNED_WINDOW_PROPERTY_KEY(gfx::Rect, |
| 49 kVirtualKeyboardRestoreBoundsKey, |
| 50 nullptr); |
| 48 DEFINE_WINDOW_PROPERTY_KEY( | 51 DEFINE_WINDOW_PROPERTY_KEY( |
| 49 ui::WindowShowState, kRestoreShowStateKey, ui::SHOW_STATE_DEFAULT); | 52 ui::WindowShowState, kRestoreShowStateKey, ui::SHOW_STATE_DEFAULT); |
| 50 DEFINE_WINDOW_PROPERTY_KEY( | 53 DEFINE_WINDOW_PROPERTY_KEY( |
| 51 ui::WindowShowState, kShowStateKey, ui::SHOW_STATE_DEFAULT); | 54 ui::WindowShowState, kShowStateKey, ui::SHOW_STATE_DEFAULT); |
| 52 DEFINE_OWNED_WINDOW_PROPERTY_KEY(base::string16, kTitleKey, nullptr); | 55 DEFINE_OWNED_WINDOW_PROPERTY_KEY(base::string16, kTitleKey, nullptr); |
| 53 DEFINE_WINDOW_PROPERTY_KEY(int, kTopViewInset, 0); | 56 DEFINE_WINDOW_PROPERTY_KEY(int, kTopViewInset, 0); |
| 54 DEFINE_WINDOW_PROPERTY_KEY(SkColor, kTopViewColor, SK_ColorTRANSPARENT); | 57 DEFINE_WINDOW_PROPERTY_KEY(SkColor, kTopViewColor, SK_ColorTRANSPARENT); |
| 55 DEFINE_OWNED_WINDOW_PROPERTY_KEY(gfx::ImageSkia, kWindowIconKey, nullptr); | 58 DEFINE_OWNED_WINDOW_PROPERTY_KEY(gfx::ImageSkia, kWindowIconKey, nullptr); |
| 56 DEFINE_WINDOW_PROPERTY_KEY(ui::mojom::WindowType, | 59 DEFINE_WINDOW_PROPERTY_KEY(ui::mojom::WindowType, |
| 57 kWindowTypeKey, | 60 kWindowTypeKey, |
| 58 ui::mojom::WindowType::UNKNOWN); | 61 ui::mojom::WindowType::UNKNOWN); |
| 59 | 62 |
| 60 } // namespace client | 63 } // namespace client |
| 61 } // namespace aura | 64 } // namespace aura |
| OLD | NEW |