| OLD | NEW |
|---|
| 1 // Copyright 2017 The Chromium Authors. All rights reserved. | 1 // Copyright 2017 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 "ash/public/cpp/window_properties.h" | 5 #include "ash/public/cpp/window_properties.h" |
| 6 | 6 |
| 7 #include "ash/public/interfaces/window_pin_type.mojom.h" | 7 #include "ash/public/interfaces/window_pin_type.mojom.h" |
| 8 | 8 |
| 9 DECLARE_EXPORTED_UI_CLASS_PROPERTY_TYPE(ASH_PUBLIC_EXPORT, | 9 DECLARE_EXPORTED_UI_CLASS_PROPERTY_TYPE(ASH_PUBLIC_EXPORT, |
| 10 ash::mojom::WindowPinType) | 10 ash::mojom::WindowPinType) |
| 11 DECLARE_EXPORTED_UI_CLASS_PROPERTY_TYPE(ASH_PUBLIC_EXPORT, ash::ShelfID*); |
| 11 | 12 |
| 12 namespace ash { | 13 namespace ash { |
| 13 | 14 |
| 14 DEFINE_UI_CLASS_PROPERTY_KEY(bool, kPanelAttachedKey, true); | 15 DEFINE_UI_CLASS_PROPERTY_KEY(bool, kPanelAttachedKey, true); |
| 16 DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(ShelfID, kShelfIDKey, nullptr); |
| 15 DEFINE_UI_CLASS_PROPERTY_KEY(int32_t, kShelfItemTypeKey, TYPE_UNDEFINED); | 17 DEFINE_UI_CLASS_PROPERTY_KEY(int32_t, kShelfItemTypeKey, TYPE_UNDEFINED); |
| 16 DEFINE_UI_CLASS_PROPERTY_KEY(ash::mojom::WindowPinType, | 18 DEFINE_UI_CLASS_PROPERTY_KEY(ash::mojom::WindowPinType, |
| 17 kWindowPinTypeKey, | 19 kWindowPinTypeKey, |
| 18 ash::mojom::WindowPinType::NONE); | 20 ash::mojom::WindowPinType::NONE); |
| 19 | 21 |
| 20 } // namespace ash | 22 } // namespace ash |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2860503002:
mash: Replace int ShelfIDs with AppLaunchID strings. (Closed)
