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

Unified Diff: ash/mus/window_manager.cc

Issue 2860503002: mash: Replace int ShelfIDs with AppLaunchID strings. (Closed)
Patch Set: Fix struct traits typo. 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/metrics/user_metrics_recorder_unittest.cc ('k') | ash/mus_property_mirror_ash_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/mus/window_manager.cc
diff --git a/ash/mus/window_manager.cc b/ash/mus/window_manager.cc
index b7cf573e32728bc6da710e6c9b47acadef7e83c1..ee4d4cf7d8652655f0d43dcf4fbbc8ee546ab3a4 100644
--- a/ash/mus/window_manager.cc
+++ b/ash/mus/window_manager.cc
@@ -90,6 +90,9 @@ WindowManager::WindowManager(service_manager::Connector* connector,
ui::mojom::WindowManager::kRenderParentTitleArea_Property,
aura::PropertyConverter::CreateAcceptAnyValueCallback());
property_converter_->RegisterProperty(
+ kShelfIDKey, ui::mojom::WindowManager::kShelfID_Property,
+ aura::PropertyConverter::CreateAcceptAnyValueCallback());
+ property_converter_->RegisterProperty(
kShelfItemTypeKey, ui::mojom::WindowManager::kShelfItemType_Property,
base::Bind(&IsValidShelfItemType));
property_converter_->RegisterProperty(
« no previous file with comments | « ash/metrics/user_metrics_recorder_unittest.cc ('k') | ash/mus_property_mirror_ash_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698