Replace kCanMaximize/Minimize/Resize with kResizeBehavior.

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 600 matching lines @@
                      init_params.mus_properties.end());
   if (!init_params.bounds.IsEmpty()) {
     (*properties)[ui::mojom::WindowManager::kUserSetBounds_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>>(init_params.keep_on_top);
+      mojo::ConvertTo<std::vector<uint8_t>>(
+          static_cast<int64_t>(init_params.keep_on_top));
 
   if (!Widget::RequiresNonClientView(init_params.type))
     return;
 
   (*properties)[ui::mojom::WindowManager::kWindowType_Property] =
-      mojo::ConvertTo<std::vector<uint8_t>>(static_cast<int32_t>(
+      mojo::ConvertTo<std::vector<uint8_t>>(static_cast<int64_t>(

[sky, 2016/11/30 03:17:28]

optional as this code is going away at some point: use
PropertyConverter::PrimitiveType here and 682.

[msw, 2016/11/30 18:16:37]

Done.

           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>>(
-            DesktopWindowTreeHostMus::GetResizeBehaviorFromDelegate(
-                init_params.delegate));
-  }
 
   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<int64_t>(init_params.delegate->GetResizeBehavior()));
+    }
+
     // 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();
@@ skipping 622 matching lines @@
 
 bool NativeWidgetMus::IsTranslucentWindowOpacitySupported() const {
   NOTIMPLEMENTED();
   return true;
 }
 
 void NativeWidgetMus::OnSizeConstraintsChanged() {
   if (!window_ || is_parallel_widget_in_window_manager())
     return;
 
+  int32_t behavior = ui::mojom::kResizeBehaviorNone;
+  if (GetWidget()->widget_delegate())
+    behavior = GetWidget()->widget_delegate()->GetResizeBehavior();
   window_->SetSharedProperty<int32_t>(
-      ui::mojom::WindowManager::kResizeBehavior_Property,
-      DesktopWindowTreeHostMus::GetResizeBehaviorFromDelegate(
-          GetWidget()->widget_delegate()));
+      ui::mojom::WindowManager::kResizeBehavior_Property, behavior);
 }
 
 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