Corrects NativeWidgetAura state model to not minimize on every restore

ui/views/widget/widget.cc

Index: ui/views/widget/widget.cc
diff --git a/ui/views/widget/widget.cc b/ui/views/widget/widget.cc
index c715a3b36ce61331fa6c9318e7d54317496bb6c9..dfb691397834f239b6e694d656053a8ddaff1c4a 100644
--- a/ui/views/widget/widget.cc
+++ b/ui/views/widget/widget.cc
@@ -355,8 +355,10 @@ void Widget::Init(const InitParams& in_params) {
     SetInitialBounds(params.bounds);
     if (params.show_state == ui::SHOW_STATE_MAXIMIZED)
       Maximize();
-    else if (params.show_state == ui::SHOW_STATE_MINIMIZED)
+    else if (params.show_state == ui::SHOW_STATE_MINIMIZED) {
       Minimize();
+      saved_show_state_ = ui::SHOW_STATE_MINIMIZED;
+    }
   } else if (params.delegate) {
     SetContentsView(params.delegate->GetContentsView());
     SetInitialBoundsForFramelessWindow(params.bounds);
@@ -606,10 +608,8 @@ void Widget::Show() {
         !IsFullscreen()) {
       native_widget_->ShowMaximizedWithBounds(initial_restored_bounds_);
     } else {
-      ui::WindowShowState show_state =
-          IsFullscreen() ? ui::SHOW_STATE_FULLSCREEN :
-          IsMinimized() ? ui::SHOW_STATE_MINIMIZED : saved_show_state_;
-      native_widget_->ShowWithWindowState(show_state);
+      native_widget_->ShowWithWindowState(
+          IsFullscreen() ? ui::SHOW_STATE_FULLSCREEN : saved_show_state_);

[varkha, 2016/04/22 19:06:41]

This reverts part of the change from the breaking CL:
https://codereview.chromium.org/1130033003/diff/380001/ui/views/widget/widget.cc.
The flow which the other CL was trying to fix is still working but only once
after a widget is created.

     }
     // |saved_show_state_| only applies the first time the window is shown.
     // If we don't reset the value the window may be shown maximized every time