| 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 1e195f683eb7fd57b72706f036cd76dd3fac799b..b7474348d316201d7f9db1ee427d3f12251a6d87 100644
|
| --- a/ui/views/widget/native_widget_aura.cc
|
| +++ b/ui/views/widget/native_widget_aura.cc
|
| @@ -477,8 +477,7 @@ void NativeWidgetAura::ShowWithWindowState(ui::WindowShowState state) {
|
| if (!window_)
|
| return;
|
|
|
| - if (state == ui::SHOW_STATE_MAXIMIZED || state == ui::SHOW_STATE_FULLSCREEN)
|
| - window_->SetProperty(aura::client::kShowStateKey, state);
|
| + window_->SetProperty(aura::client::kShowStateKey, state);
|
| window_->Show();
|
| if (delegate_->CanActivate()) {
|
| if (state != ui::SHOW_STATE_INACTIVE)
|
| @@ -488,6 +487,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 {
|
|
|