| Index: ui/views/widget/native_widget_aura.cc
|
| diff --git a/ui/views/widget/native_widget_aura.cc b/ui/views/widget/native_widget_aura.cc
|
| index df9ace0b9dda84a48100fd8b34e4ef4983346bd0..1f0d60db4e9bf570dfd7b62a55a54018b4fb4281 100644
|
| --- a/ui/views/widget/native_widget_aura.cc
|
| +++ b/ui/views/widget/native_widget_aura.cc
|
| @@ -696,6 +696,10 @@ gfx::Size NativeWidgetAura::GetMinimumSize() const {
|
| }
|
|
|
| gfx::Size NativeWidgetAura::GetMaximumSize() const {
|
| + // If a window have a maximum size, the window should not be
|
| + // maximizable.
|
| + DCHECK(delegate_->GetMaximumSize().IsEmpty() ||
|
| + !window_->GetProperty(aura::client::kCanMaximizeKey));
|
| return delegate_->GetMaximumSize();
|
| }
|
|
|
|
|