| 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 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 50 ui::WindowShowState, kPreFullscreenShowStateKey, ui::SHOW_STATE_DEFAULT); | 50 ui::WindowShowState, kPreFullscreenShowStateKey, ui::SHOW_STATE_DEFAULT); |
| 51 DEFINE_WINDOW_PROPERTY_KEY( | 51 DEFINE_WINDOW_PROPERTY_KEY( |
| 52 ui::WindowShowState, kShowStateKey, ui::SHOW_STATE_DEFAULT); | 52 ui::WindowShowState, kShowStateKey, ui::SHOW_STATE_DEFAULT); |
| 53 DEFINE_OWNED_WINDOW_PROPERTY_KEY(base::string16, kTitleKey, nullptr); | 53 DEFINE_OWNED_WINDOW_PROPERTY_KEY(base::string16, kTitleKey, nullptr); |
| 54 DEFINE_WINDOW_PROPERTY_KEY(int, kTopViewInset, 0); | 54 DEFINE_WINDOW_PROPERTY_KEY(int, kTopViewInset, 0); |
| 55 DEFINE_WINDOW_PROPERTY_KEY(SkColor, kTopViewColor, SK_ColorTRANSPARENT); | 55 DEFINE_WINDOW_PROPERTY_KEY(SkColor, kTopViewColor, SK_ColorTRANSPARENT); |
| 56 DEFINE_OWNED_WINDOW_PROPERTY_KEY(gfx::ImageSkia, kWindowIconKey, nullptr); | 56 DEFINE_OWNED_WINDOW_PROPERTY_KEY(gfx::ImageSkia, kWindowIconKey, nullptr); |
| 57 DEFINE_WINDOW_PROPERTY_KEY(ui::mojom::WindowType, | 57 DEFINE_WINDOW_PROPERTY_KEY(ui::mojom::WindowType, |
| 58 kWindowTypeKey, | 58 kWindowTypeKey, |
| 59 ui::mojom::WindowType::UNKNOWN); | 59 ui::mojom::WindowType::UNKNOWN); |
| 60 DEFINE_WINDOW_PROPERTY_KEY(int32_t, kAccessibleChildTreeIdKey, 0); |
| 60 | 61 |
| 61 } // namespace client | 62 } // namespace client |
| 62 } // namespace aura | 63 } // namespace aura |
| OLD | NEW |