| Index: chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc
|
| diff --git a/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc b/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc
|
| index 0452f4566d5c5dc346e181617b835f51d4c1c547..bff993ba9b5774f7f1f98cbb42a011f331c58fba 100644
|
| --- a/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc
|
| +++ b/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc
|
| @@ -49,19 +49,19 @@ void ChromeBrowserMainExtraPartsAsh::ServiceManagerConnectionStarted(
|
| aura::WindowTreeClientDelegate* delegate = mus_client;
|
| aura::PropertyConverter* converter = delegate->GetPropertyConverter();
|
|
|
| - converter->RegisterProperty(
|
| + converter->RegisterPrimitiveProperty(
|
| ash::kPanelAttachedKey,
|
| ui::mojom::WindowManager::kPanelAttached_Property,
|
| aura::PropertyConverter::CreateAcceptAnyValueCallback());
|
| - converter->RegisterProperty(ash::kShelfIDKey,
|
| - ui::mojom::WindowManager::kShelfID_Property);
|
| - converter->RegisterProperty(
|
| + converter->RegisterPrimitiveProperty(
|
| ash::kShelfItemTypeKey,
|
| ui::mojom::WindowManager::kShelfItemType_Property,
|
| base::Bind(&ash::IsValidShelfItemType));
|
| - converter->RegisterProperty(ash::kWindowPinTypeKey,
|
| - ash::mojom::kWindowPinType_Property,
|
| - base::Bind(&ash::IsValidWindowPinType));
|
| + converter->RegisterPrimitiveProperty(
|
| + ash::kWindowPinTypeKey, ash::mojom::kWindowPinType_Property,
|
| + base::Bind(&ash::IsValidWindowPinType));
|
| + converter->RegisterStringProperty(
|
| + ash::kShelfIDKey, ui::mojom::WindowManager::kShelfID_Property);
|
|
|
| mus_client->SetMusPropertyMirror(
|
| base::MakeUnique<ash::MusPropertyMirrorAsh>());
|
|
|