Adds a couple more properties to the property converter

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/pointer_watcher_event_router2.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/views/widget/widget_delegate.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")
 
@@ skipping 32 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

[msw, 2016/11/29 01:15:45]

Why can't/shouldn't this be static anymore?

[sky, 2016/11/29 04:19:36]

Good point. Done.

 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 =
+  using PrimitiveType = aura::PropertyConverter::PrimitiveType;
+  std::map<std::string, std::vector<uint8_t>> properties =
       init_params.mus_properties;
+
   // Widget::InitParams::Type matches ui::mojom::WindowType.
-  mus_properties[ui::mojom::WindowManager::kWindowType_Property] =
+  properties[ui::mojom::WindowManager::kWindowType_Property] =
       mojo::ConvertTo<std::vector<uint8_t>>(
           static_cast<int32_t>(init_params.type));
-  return mus_properties;
+
+  if (!init_params.bounds.IsEmpty()) {
+    properties[ui::mojom::WindowManager::kInitialBounds_Property] =
+        mojo::ConvertTo<std::vector<uint8_t>>(init_params.bounds);
+  }
+
+  if (!init_params.name.empty()) {
+    properties[ui::mojom::WindowManager::kName_Property] =
+        mojo::ConvertTo<std::vector<uint8_t>>(init_params.name);
+  }
+
+  properties[ui::mojom::WindowManager::kAlwaysOnTop_Property] =
+      mojo::ConvertTo<std::vector<uint8_t>>(
+          static_cast<PrimitiveType>(init_params.keep_on_top));
+
+  if (!Widget::RequiresNonClientView(init_params.type))
+    return properties;
+
+  if (init_params.delegate) {
+    if (properties.count(ui::mojom::WindowManager::kResizeBehavior_Property) ==
+        0) {
+      properties[ui::mojom::WindowManager::kResizeBehavior_Property] =
+          mojo::ConvertTo<std::vector<uint8_t>>(static_cast<PrimitiveType>(
+              DesktopWindowTreeHostMus::GetResizeBehaviorFromDelegate(
+                  init_params.delegate)));
+    }
+
+    // TODO(crbug.com/667566): Support additional scales or gfx::Image[Skia].
+    gfx::ImageSkia app_icon = init_params.delegate->GetWindowAppIcon();
+    SkBitmap app_bitmap = app_icon.GetRepresentation(1.f).sk_bitmap();
+    if (!app_bitmap.isNull()) {
+      properties[ui::mojom::WindowManager::kAppIcon_Property] =
+          mojo::ConvertTo<std::vector<uint8_t>>(app_bitmap);
+    }
+    // TODO(crbug.com/667566): Support additional scales or gfx::Image[Skia].
+    gfx::ImageSkia window_icon = init_params.delegate->GetWindowIcon();
+    SkBitmap window_bitmap = window_icon.GetRepresentation(1.f).sk_bitmap();
+    if (!window_bitmap.isNull()) {
+      properties[ui::mojom::WindowManager::kWindowIcon_Property] =
+          mojo::ConvertTo<std::vector<uint8_t>>(window_bitmap);
+    }
+  }
+
+  return 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;
   }
 
@@ skipping 104 matching lines @@
       return root->GetTopWindowContainingPoint(relative_point);
   }
   return nullptr;
 }
 
 std::unique_ptr<OSExchangeData::Provider> MusClient::BuildProvider() {
   return base::MakeUnique<aura::OSExchangeDataProviderMus>();
 }
 
 }  // namespace views