Propagates window type properties during aura-mus window creation

ui/views/mus/mus_client.cc

 // Copyright 2016 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 "ui/views/mus/mus_client.h"
 
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
 #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"
 #include "ui/aura/mus/property_converter.h"
 #include "ui/aura/mus/window_tree_client.h"
 #include "ui/aura/mus/window_tree_host_mus.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/views/mus/aura_init.h"
 #include "ui/views/mus/clipboard_mus.h"
 #include "ui/views/mus/desktop_window_tree_host_mus.h"
 #include "ui/views/mus/screen_mus.h"
 #include "ui/views/views_delegate.h"
 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
 #include "ui/wm/core/capture_controller.h"
 #include "ui/wm/core/wm_state.h"
 
+// Widget::InitParams::Type must match that of ui::mojom::WindowType.
+#define WINDOW_TYPES_MATCH(NAME)                                      \
+  static_assert(                                                      \
+      static_cast<int32_t>(views::Widget::InitParams::TYPE_##NAME) == \
+          static_cast<int32_t>(ui::mojom::WindowType::NAME),          \
+      "Window type constants must match")
+
+WINDOW_TYPES_MATCH(WINDOW);
+WINDOW_TYPES_MATCH(PANEL);
+WINDOW_TYPES_MATCH(WINDOW_FRAMELESS);
+WINDOW_TYPES_MATCH(CONTROL);
+WINDOW_TYPES_MATCH(POPUP);
+WINDOW_TYPES_MATCH(MENU);
+WINDOW_TYPES_MATCH(TOOLTIP);
+WINDOW_TYPES_MATCH(BUBBLE);
+WINDOW_TYPES_MATCH(DRAG);

[msw, 2016/11/21 22:40:45]

nit: add UNKNOWN too

[sky, 2016/11/21 22:42:09]

I can't. Widget::InitParams::Type doesn't have UNKNOWN.

+
 namespace views {
 
 // static
 MusClient* MusClient::instance_ = nullptr;
 
 MusClient::~MusClient() {
   // ~WindowTreeClient calls back to us (we're its delegate), destroy it while
   // we are still valid.
   window_tree_client_.reset();
   ui::OSExchangeDataProviderFactory::SetFactory(nullptr);
@@ skipping 10 matching lines @@
 }
 
 // static
 bool MusClient::ShouldCreateDesktopNativeWidgetAura(
     const Widget::InitParams& init_params) {
   // TYPE_CONTROL and child widgets require a NativeWidgetAura.
   return init_params.type != Widget::InitParams::TYPE_CONTROL &&
          !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;
+  // Widget::InitParams::Type matches ui::mojom::WindowType.
+  mus_properties[ui::mojom::WindowManager::kWindowType_Property] =
+      mojo::ConvertTo<std::vector<uint8_t>>(
+          static_cast<int32_t>(init_params.type));
+  return mus_properties;
+}
+
 NativeWidget* MusClient::CreateNativeWidget(
     const Widget::InitParams& init_params,
     internal::NativeWidgetDelegate* delegate) {
   if (!ShouldCreateDesktopNativeWidgetAura(init_params)) {
     // A null return value results in creating NativeWidgetAura.
     return nullptr;
   }
 
   DesktopNativeWidgetAura* native_widget =
       new DesktopNativeWidgetAura(delegate);
   if (init_params.desktop_window_tree_host) {
     native_widget->SetDesktopWindowTreeHost(
         base::WrapUnique(init_params.desktop_window_tree_host));
   } else {
+    std::map<std::string, std::vector<uint8_t>> mus_properties =
+        ConfigurePropertiesFromParams(init_params);
     native_widget->SetDesktopWindowTreeHost(
         base::MakeUnique<DesktopWindowTreeHostMus>(delegate, native_widget,
-                                                   init_params));
+                                                   &mus_properties));
   }
   return native_widget;
 }
 
 MusClient::MusClient(service_manager::Connector* connector,
                      const service_manager::Identity& identity,
                      scoped_refptr<base::SingleThreadTaskRunner> io_task_runner)
     : connector_(connector), identity_(identity) {
   DCHECK(!instance_);
   instance_ = this;
@@ skipping 75 matching lines @@
       return root->GetTopWindowContainingPoint(relative_point);
   }
   return nullptr;
 }
 
 std::unique_ptr<OSExchangeData::Provider> MusClient::BuildProvider() {
   return base::MakeUnique<aura::OSExchangeDataProviderMus>();
 }
 
 }  // namespace views