Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(780)

Side by Side Diff: ash/public/cpp/window_properties.cc

Issue 2860503002: mash: Replace int ShelfIDs with AppLaunchID strings. (Closed)
Patch Set: Restore AppLaunchId class via using ShelfID = AppLaunchId; cleanup. Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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);
James Cook 2017/05/04 16:38:49 dumb question: Since ShelfID has copy and assignme
msw 2017/05/04 19:05:57 That'd be great, but properties are stored as int6
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
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698