| 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 8099626710db18abf5751e2c015403307ec4ff92..4d49fef8a813fc400cdc9306e2fda1c246615d9e 100644
|
| --- a/ui/views/widget/native_widget_aura.cc
|
| +++ b/ui/views/widget/native_widget_aura.cc
|
| @@ -481,10 +481,7 @@ void NativeWidgetAura::ShowWithWindowState(ui::WindowShowState state) {
|
| if (!window_)
|
| return;
|
|
|
| - if (state == ui::SHOW_STATE_MAXIMIZED || state == ui::SHOW_STATE_FULLSCREEN ||
|
| - state == ui::SHOW_STATE_DOCKED) {
|
| - window_->SetProperty(aura::client::kShowStateKey, state);
|
| - }
|
| + window_->SetProperty(aura::client::kShowStateKey, state);
|
| window_->Show();
|
| if (delegate_->CanActivate()) {
|
| if (state != ui::SHOW_STATE_INACTIVE)
|
| @@ -494,6 +491,11 @@ void NativeWidgetAura::ShowWithWindowState(ui::WindowShowState state) {
|
| // do the right thing.
|
| SetInitialFocus(state);
|
| }
|
| +
|
| + // On desktop aura, a window is activated first even when it is shown as
|
| + // minimized. Do the same for consistency.
|
| + if (state == ui::SHOW_STATE_MINIMIZED)
|
| + Minimize();
|
| }
|
|
|
| bool NativeWidgetAura::IsVisible() const {
|
|
|