| 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 c09617c3cc23de781dde79365282e5c2d0bb764e..9e4bffe97840db0607671ba8af46a6a96f6b99c3 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
|
| @@ -45,12 +45,15 @@ void ChromeBrowserMainExtraPartsAsh::ServiceManagerConnectionStarted(
|
| views::MusClient* mus_client = views::MusClient::Get();
|
| aura::WindowTreeClientDelegate* delegate = mus_client;
|
| aura::PropertyConverter* converter = delegate->GetPropertyConverter();
|
| +
|
| converter->RegisterProperty(
|
| ash::kPanelAttachedKey,
|
| - ui::mojom::WindowManager::kPanelAttached_Property);
|
| + ui::mojom::WindowManager::kPanelAttached_Property,
|
| + aura::PropertyConverter::CreateAcceptAnyValueCallback());
|
| converter->RegisterProperty(
|
| ash::kShelfItemTypeKey,
|
| - ui::mojom::WindowManager::kShelfItemType_Property);
|
| + ui::mojom::WindowManager::kShelfItemType_Property,
|
| + base::Bind(&ash::IsValidShelfItemType));
|
|
|
| mus_client->SetMusPropertyMirror(
|
| base::MakeUnique<ash::MusPropertyMirrorAsh>());
|
|
|