| Index: ash/mus/non_client_frame_controller.cc
|
| diff --git a/ash/mus/non_client_frame_controller.cc b/ash/mus/non_client_frame_controller.cc
|
| index 3be1f29c35d87146dce4b667ba11658ecd4f59dd..8767bf1457e2b587fb65caebdbb721a20278873b 100644
|
| --- a/ash/mus/non_client_frame_controller.cc
|
| +++ b/ash/mus/non_client_frame_controller.cc
|
| @@ -21,6 +21,7 @@
|
| #include "ash/shared/immersive_fullscreen_controller_delegate.h"
|
| #include "ash/wm/panels/panel_frame_view.h"
|
| #include "ash/wm/window_properties.h"
|
| +#include "ash/wm/window_util.h"
|
| #include "ash/wm_window.h"
|
| #include "base/macros.h"
|
| #include "base/memory/ptr_util.h"
|
| @@ -387,15 +388,18 @@ base::string16 NonClientFrameController::GetWindowTitle() const {
|
| }
|
|
|
| bool NonClientFrameController::CanResize() const {
|
| - return window_ && WmWindow::Get(window_)->CanResize();
|
| + return window_ && (window_->GetProperty(aura::client::kResizeBehaviorKey) &
|
| + ui::mojom::kResizeBehaviorCanResize) != 0;
|
| }
|
|
|
| bool NonClientFrameController::CanMaximize() const {
|
| - return window_ && WmWindow::Get(window_)->CanMaximize();
|
| + return window_ && (window_->GetProperty(aura::client::kResizeBehaviorKey) &
|
| + ui::mojom::kResizeBehaviorCanMaximize) != 0;
|
| }
|
|
|
| bool NonClientFrameController::CanMinimize() const {
|
| - return window_ && WmWindow::Get(window_)->CanMinimize();
|
| + return window_ && (window_->GetProperty(aura::client::kResizeBehaviorKey) &
|
| + ui::mojom::kResizeBehaviorCanMinimize) != 0;
|
| }
|
|
|
| bool NonClientFrameController::ShouldShowWindowTitle() const {
|
|
|