Propagates window type properties during aura-mus window creation

ui/views/mus/mus_client.cc

Index: ui/views/mus/mus_client.cc
diff --git a/ui/views/mus/mus_client.cc b/ui/views/mus/mus_client.cc
index 3b2b4139c7a83ff926505701bbba8712cc0dd4df..4eeac2acbc0c5b0e9acf6633e0f0f54f3ebe7b09 100644
--- a/ui/views/mus/mus_client.cc
+++ b/ui/views/mus/mus_client.cc
@@ -9,7 +9,9 @@
 #include "services/service_manager/public/cpp/connection.h"
 #include "services/service_manager/public/cpp/connector.h"
 #include "services/ui/public/cpp/gpu/gpu_service.h"
+#include "services/ui/public/cpp/property_type_converters.h"
 #include "services/ui/public/interfaces/event_matcher.mojom.h"
+#include "services/ui/public/interfaces/window_manager.mojom.h"
 #include "ui/aura/env.h"
 #include "ui/aura/mus/mus_context_factory.h"
 #include "ui/aura/mus/os_exchange_data_provider_mus.h"
@@ -57,6 +59,18 @@ bool MusClient::ShouldCreateDesktopNativeWidgetAura(
          !init_params.child;
 }
 
+// static
+std::map<std::string, std::vector<uint8_t>>
+MusClient::ConfigurePropertiesFromParams(
+    const Widget::InitParams& init_params) {
+  std::map<std::string, std::vector<uint8_t>> mus_properties =
+      init_params.mus_properties;
+  mus_properties[ui::mojom::WindowManager::kWindowType_Property] =
+      mojo::ConvertTo<std::vector<uint8_t>>(
+          static_cast<int32_t>(init_params.type));

[msw, 2016/11/21 19:26:47]

Hmm, this sets kWindowType_Property to a Widget::InitParams::Type value, but
window_tree_client.cc at lines 134 and 1396 static-casts it to
ui::mojom::WindowType; I realize they're parallel, but this seems a bit strange
without some explicit type conversion or at least a comment.

[sky, 2016/11/21 22:13:56]

Done.

+  return mus_properties;
+}
+
 NativeWidget* MusClient::CreateNativeWidget(
     const Widget::InitParams& init_params,
     internal::NativeWidgetDelegate* delegate) {
@@ -71,9 +85,14 @@ NativeWidget* MusClient::CreateNativeWidget(
     native_widget->SetDesktopWindowTreeHost(
         base::WrapUnique(init_params.desktop_window_tree_host));
   } else {
+    std::map<std::string, std::vector<uint8_t>> mus_properties =

[msw, 2016/11/21 19:26:47]

Should this use the helper above?

[sky, 2016/11/21 22:13:56]

Done.

+        init_params.mus_properties;
+    mus_properties[ui::mojom::WindowManager::kWindowType_Property] =
+        mojo::ConvertTo<std::vector<uint8_t>>(
+            static_cast<int32_t>(init_params.type));
     native_widget->SetDesktopWindowTreeHost(
         base::MakeUnique<DesktopWindowTreeHostMus>(delegate, native_widget,
-                                                   init_params));
+                                                   &mus_properties));
   }
   return native_widget;
 }