Replace kCanMaximize/Minimize/Resize with kResizeBehavior.

ui/views/mus/desktop_window_tree_host_mus.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/desktop_window_tree_host_mus.h"
 
 #include "base/memory/ptr_util.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/drag_drop_client.h"
 #include "ui/aura/client/focus_client.h"
@@ skipping 112 matching lines @@
   // TODO: use display id and bounds if available, likely need to pass in
   // InitParams for that.
 }
 
 DesktopWindowTreeHostMus::~DesktopWindowTreeHostMus() {
   MusClient::Get()->RemoveObserver(this);
   aura::Env::GetInstance()->RemoveObserver(this);
   desktop_native_widget_aura_->OnDesktopWindowTreeHostDestroyed(this);
 }
 
-// static
-int DesktopWindowTreeHostMus::GetResizeBehaviorFromDelegate(
-    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;
-}
-
 bool DesktopWindowTreeHostMus::IsDocked() const {
   return window()->GetProperty(aura::client::kShowStateKey) ==
          ui::SHOW_STATE_DOCKED;
 }
 
 // TODO(erg): In addition to being called on system events, this also needs to
 // be called after window size changed.
 void DesktopWindowTreeHostMus::SendClientAreaToServer() {
   NonClientView* non_client_view =
       native_widget_delegate_->AsWidget()->non_client_view();
@@ skipping 384 matching lines @@
 
 bool DesktopWindowTreeHostMus::IsAnimatingClosed() const {
   return false;
 }
 
 bool DesktopWindowTreeHostMus::IsTranslucentWindowOpacitySupported() const {
   return true;
 }
 
 void DesktopWindowTreeHostMus::SizeConstraintsChanged() {
+  int32_t behavior = ui::mojom::kResizeBehaviorNone;
   Widget* widget = native_widget_delegate_->AsWidget();
-  window()->SetProperty(aura::client::kCanMaximizeKey,
-                        widget->widget_delegate()->CanMaximize());
-  window()->SetProperty(aura::client::kCanMinimizeKey,
-                        widget->widget_delegate()->CanMinimize());
-  window()->SetProperty(aura::client::kCanResizeKey,
-                        widget->widget_delegate()->CanResize());
-  // TODO: replace above keys with kResizeBehaviorKey. http://crbug.com/669290.
-  window()->SetProperty(
-      aura::client::kResizeBehaviorKey,
-      GetResizeBehaviorFromDelegate(widget->widget_delegate()));
+  if (widget->widget_delegate())
+    behavior = widget->widget_delegate()->GetResizeBehavior();
+  window()->SetProperty(aura::client::kResizeBehaviorKey, behavior);
 }
 
 void DesktopWindowTreeHostMus::OnWindowManagerFrameValuesChanged() {
   NonClientView* non_client_view =
       native_widget_delegate_->AsWidget()->non_client_view();
   if (non_client_view) {
     non_client_view->Layout();
     non_client_view->SchedulePaint();
   }
 
@@ skipping 39 matching lines @@
   if (window == this->window()) {
     is_active_ = true;
     desktop_native_widget_aura_->HandleActivationChanged(true);
   } else if (is_active_) {
     is_active_ = false;
     desktop_native_widget_aura_->HandleActivationChanged(false);
   }
 }
 
 }  // namespace views