Adds a couple more properties to the property converter

ui/views/mus/native_widget_mus.cc

 // Copyright 2015 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.
 
 // This has to be before any other includes, else default is picked up.
 // See base/logging for details on this.
 #define NOTIMPLEMENTED_POLICY 5
 
 #include "ui/views/mus/native_widget_mus.h"
 
@@ skipping 26 matching lines @@
 #include "ui/display/screen.h"
 #include "ui/events/event.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/path.h"
 #include "ui/native_theme/native_theme_aura.h"
 #include "ui/platform_window/platform_window_delegate.h"
 #include "ui/views/corewm/tooltip.h"
 #include "ui/views/corewm/tooltip_aura.h"
 #include "ui/views/corewm/tooltip_controller.h"
 #include "ui/views/drag_utils.h"
+#include "ui/views/mus/desktop_window_tree_host_mus.h"
 #include "ui/views/mus/drag_drop_client_mus.h"
 #include "ui/views/mus/drop_target_mus.h"
 #include "ui/views/mus/input_method_mus.h"
 #include "ui/views/mus/window_manager_connection.h"
 #include "ui/views/mus/window_manager_constants_converters.h"
 #include "ui/views/mus/window_manager_frame_values.h"
 #include "ui/views/mus/window_tree_host_mus.h"
 #include "ui/views/widget/drop_helper.h"
 #include "ui/views/widget/native_widget_aura.h"
 #include "ui/views/widget/tooltip_manager_aura.h"
@@ skipping 259 matching lines @@
             .size();
     return gfx::Size(max_size.width() == 0 ? 0 : converted_size.width(),
                      max_size.height() == 0 ? 0 : converted_size.height());
   }
 
   views::Widget* widget_;
 
   DISALLOW_COPY_AND_ASSIGN(ClientSideNonClientFrameView);
 };
 
-int ResizeBehaviorFromDelegate(WidgetDelegate* delegate) {
-  if (!delegate)
-    return ui::mojom::kResizeBehaviorNone;
-
-  int32_t behavior = ui::mojom::kResizeBehaviorNone;
-  if (delegate->CanResize())
-    behavior |= ui::mojom::kResizeBehaviorCanResize;
-  if (delegate->CanMaximize())
-    behavior |= ui::mojom::kResizeBehaviorCanMaximize;
-  if (delegate->CanMinimize())
-    behavior |= ui::mojom::kResizeBehaviorCanMinimize;
-  return behavior;
-}
-
 // Handles acknowledgment of an input event, either immediately when a nested
 // message loop starts, or upon destruction.
 class EventAckHandler : public base::MessageLoop::NestingObserver {
  public:
   explicit EventAckHandler(
       std::unique_ptr<base::Callback<void(EventResult)>> ack_callback)
       : ack_callback_(std::move(ack_callback)) {
     DCHECK(ack_callback_);
     base::MessageLoop::current()->AddNestingObserver(this);
   }
@@ skipping 334 matching lines @@
     return;
 
   (*properties)[ui::mojom::WindowManager::kWindowType_Property] =
       mojo::ConvertTo<std::vector<uint8_t>>(static_cast<int32_t>(
           mojo::ConvertTo<ui::mojom::WindowType>(init_params.type)));
   if (init_params.delegate &&
       properties->count(ui::mojom::WindowManager::kResizeBehavior_Property) ==
           0) {
     (*properties)[ui::mojom::WindowManager::kResizeBehavior_Property] =
         mojo::ConvertTo<std::vector<uint8_t>>(
-            ResizeBehaviorFromDelegate(init_params.delegate));
+            DesktopWindowTreeHostMus::GetResizeBehaviorFromDelegate(
+                init_params.delegate));
   }
 
   if (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);
     }
@@ skipping 627 matching lines @@
   NOTIMPLEMENTED();
   return true;
 }
 
 void NativeWidgetMus::OnSizeConstraintsChanged() {
   if (!window_ || is_parallel_widget_in_window_manager())
     return;
 
   window_->SetSharedProperty<int32_t>(
       ui::mojom::WindowManager::kResizeBehavior_Property,
-      ResizeBehaviorFromDelegate(GetWidget()->widget_delegate()));
+      DesktopWindowTreeHostMus::GetResizeBehaviorFromDelegate(
+          GetWidget()->widget_delegate()));
 }
 
 void NativeWidgetMus::RepostNativeEvent(gfx::NativeEvent native_event) {
   NOTIMPLEMENTED();
 }
 
 std::string NativeWidgetMus::GetName() const {
   return window_->GetName();
 }
 
@@ skipping 222 matching lines @@
 
   gfx::Path mask_path;
   native_widget_delegate_->GetHitTestMask(&mask_path);
   // TODO(jamescook): Use the full path for the mask.
   gfx::Rect mask_rect =
       gfx::ToEnclosingRect(gfx::SkRectToRectF(mask_path.getBounds()));
   window_->SetHitTestMask(mask_rect);
 }
 
 }  // namespace views