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