| Index: ui/views/mus/desktop_window_tree_host_mus.cc
|
| diff --git a/ui/views/mus/desktop_window_tree_host_mus.cc b/ui/views/mus/desktop_window_tree_host_mus.cc
|
| index bdcf46e82eb83aa3356cb3ab202a6cc038307386..98bddc6132a726f1ebc62a468dbc2e9260ee4767 100644
|
| --- a/ui/views/mus/desktop_window_tree_host_mus.cc
|
| +++ b/ui/views/mus/desktop_window_tree_host_mus.cc
|
| @@ -130,22 +130,6 @@ DesktopWindowTreeHostMus::~DesktopWindowTreeHostMus() {
|
| 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;
|
| @@ -550,17 +534,11 @@ bool DesktopWindowTreeHostMus::IsTranslucentWindowOpacitySupported() const {
|
| }
|
|
|
| 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() {
|
|
|