mash: Fix mash app shelf items; encapsulate ash property setup.

chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.h"
 
-#include "ash/public/cpp/mus_property_mirror_ash.h"
-#include "ash/public/cpp/window_pin_type.h"
 #include "ash/public/cpp/window_properties.h"
-#include "ash/public/interfaces/window_pin_type.mojom.h"
 #include "ash/root_window_controller.h"
 #include "ash/shelf/shelf_model.h"
 #include "ash/shell.h"
 #include "base/memory/ptr_util.h"
 #include "chrome/browser/chrome_browser_main.h"
 #include "chrome/browser/ui/ash/ash_init.h"
 #include "chrome/browser/ui/ash/ash_util.h"
 #include "chrome/browser/ui/ash/cast_config_client_media_router.h"
 #include "chrome/browser/ui/ash/chrome_new_window_client.h"
 #include "chrome/browser/ui/ash/chrome_shell_content_state.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
 #include "chrome/browser/ui/ash/lock_screen_client.h"
 #include "chrome/browser/ui/ash/media_client.h"
 #include "chrome/browser/ui/ash/session_controller_client.h"
 #include "chrome/browser/ui/ash/system_tray_client.h"
 #include "chrome/browser/ui/ash/volume_controller.h"
 #include "chrome/browser/ui/ash/vpn_list_forwarder.h"
 #include "chrome/browser/ui/views/ash/tab_scrubber.h"
 #include "chrome/browser/ui/views/frame/immersive_context_mus.h"
 #include "chrome/browser/ui/views/frame/immersive_handler_factory_mus.h"
 #include "chrome/browser/ui/views/select_file_dialog_extension.h"
 #include "chrome/browser/ui/views/select_file_dialog_extension_factory.h"
-#include "ui/aura/mus/property_converter.h"
-#include "ui/base/class_property.h"
 #include "ui/keyboard/content/keyboard.h"
 #include "ui/keyboard/keyboard_controller.h"
-#include "ui/views/mus/mus_client.h"
 
 ChromeBrowserMainExtraPartsAsh::ChromeBrowserMainExtraPartsAsh() {}
 
 ChromeBrowserMainExtraPartsAsh::~ChromeBrowserMainExtraPartsAsh() {}
 
 void ChromeBrowserMainExtraPartsAsh::ServiceManagerConnectionStarted(
     content::ServiceManagerConnection* connection) {
   if (ash_util::IsRunningInMash()) {
     // ash::Shell will not be created because ash is running out-of-process.
     ash::Shell::SetIsBrowserProcessWithMash();
 
-    // Register ash-specific window properties with Chrome's property converter.
-    // This propagates ash properties set on chrome windows to ash, via mojo.
-    DCHECK(views::MusClient::Exists());
-    views::MusClient* mus_client = views::MusClient::Get();
-    aura::WindowTreeClientDelegate* delegate = mus_client;
-    aura::PropertyConverter* converter = delegate->GetPropertyConverter();
-
-    converter->RegisterPrimitiveProperty(
-        ash::kPanelAttachedKey,
-        ui::mojom::WindowManager::kPanelAttached_Property,
-        aura::PropertyConverter::CreateAcceptAnyValueCallback());
-    converter->RegisterPrimitiveProperty(
-        ash::kShelfItemTypeKey,
-        ui::mojom::WindowManager::kShelfItemType_Property,
-        base::Bind(&ash::IsValidShelfItemType));
-    converter->RegisterPrimitiveProperty(
-        ash::kWindowPinTypeKey, ash::mojom::kWindowPinType_Property,
-        base::Bind(&ash::IsValidWindowPinType));
-    converter->RegisterStringProperty(
-        ash::kShelfIDKey, ui::mojom::WindowManager::kShelfID_Property);

[sky, 2017/06/02 13:36:39]

Ideally clients would not have to do anything special to have their windows
appear in the shelf. What would it take to make that happen? Say for example
having task viewers window appear in the shelf without having task view
explicitly set the type and shelf id.

[msw, 2017/06/02 15:25:15]

We would need some way to (a) disambiguate windows that should be shown in the
shelf, like task_viewer, and windows that shouldn't, like chrome's 'restore
pages?' bubble (which is apparently a top-level window, perhaps with a transient
parent? maybe filter by aura::Window::type?), and (b) we'd need to do something
like my old ShelfWindowWatcher hack that assigned arbitrary types and ids to
windows before (or in lieu) of Chrome/app doing so, then fix that up once
Chrome/app assigns an id and a type, I'd essentially be restoring the code i
removed here:
https://codereview.chromium.org/2833173002/diff/340001/ash/shelf/shelf_window...

-
-    mus_client->SetMusPropertyMirror(
-        base::MakeUnique<ash::MusPropertyMirrorAsh>());
+    ash::RegisterWindowPropertiesForTransportAndMirroring();
   }
 }
 
 void ChromeBrowserMainExtraPartsAsh::PreProfileInit() {
   if (ash_util::ShouldOpenAshOnStartup())
     ash_init_ = base::MakeUnique<AshInit>();
 
   if (ash_util::IsRunningInMash()) {
     immersive_context_ = base::MakeUnique<ImmersiveContextMus>();
     immersive_handler_factory_ = base::MakeUnique<ImmersiveHandlerFactoryMus>();
@@ skipping 50 matching lines @@
   volume_controller_.reset();
   new_window_client_.reset();
   system_tray_client_.reset();
   lock_screen_client_.reset();
   media_client_.reset();
   cast_config_client_media_router_.reset();
   session_controller_client_.reset();
 
   ash_init_.reset();
 }