| 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 ee6f26b3a4483699c3454788ba91f7009af6f15b..df9ace0b9dda84a48100fd8b34e4ef4983346bd0 100644
|
| --- a/ui/views/widget/native_widget_aura.cc
|
| +++ b/ui/views/widget/native_widget_aura.cc
|
| @@ -137,13 +137,6 @@
|
| }
|
| }
|
|
|
| - // Set properties before addeing to the parent so that its layout manager
|
| - // sees the correct values.
|
| - window_->SetProperty(aura::client::kCanMaximizeKey,
|
| - GetWidget()->widget_delegate()->CanMaximize());
|
| - window_->SetProperty(aura::client::kCanResizeKey,
|
| - GetWidget()->widget_delegate()->CanResize());
|
| -
|
| if (parent) {
|
| parent->AddChild(window_);
|
| } else {
|
| @@ -173,6 +166,11 @@
|
| }
|
|
|
| aura::client::SetActivationDelegate(window_, this);
|
| +
|
| + window_->SetProperty(aura::client::kCanMaximizeKey,
|
| + GetWidget()->widget_delegate()->CanMaximize());
|
| + window_->SetProperty(aura::client::kCanResizeKey,
|
| + GetWidget()->widget_delegate()->CanResize());
|
|
|
| window_reorderer_.reset(new WindowReorderer(window_,
|
| GetWidget()->GetRootView()));
|
|
|