[WIP: Not for review] Simplify and unify widget/window show logic

ui/views/widget/widget.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/widget/widget.h"
 
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/trace_event/trace_event.h"
@@ skipping 613 matching lines @@
 }
 
 void Widget::Show() {
   const ui::Layer* layer = GetLayer();
   TRACE_EVENT1("views", "Widget::Show", "layer",
                layer ? layer->name() : "none");
   if (non_client_view_) {
     // While initializing, the kiosk mode will go to full screen before the
     // widget gets shown. In that case we stay in full screen mode, regardless
     // of the |saved_show_state_| member.
-    if (saved_show_state_ == ui::SHOW_STATE_MAXIMIZED &&
-        !initial_restored_bounds_.IsEmpty() &&
-        !IsFullscreen()) {
+    if (((saved_show_state_ == ui::SHOW_STATE_MAXIMIZED && !IsFullscreen()) ||
+         IsMaximized()) &&
+        !initial_restored_bounds_.IsEmpty()) {
       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);
+      ShowWithCurrentState();
     }
     // |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
     // it is subsequently shown after being hidden.
     saved_show_state_ = ui::SHOW_STATE_NORMAL;
   } else {
     CanActivate()
-        ? native_widget_->Show()
+        ? ShowWithCurrentState()

[oshima, 2015/12/01 23:00:06]

This is necessary to honor show_state in the widget which does not have
non_client_view_.

         : native_widget_->ShowWithWindowState(ui::SHOW_STATE_INACTIVE);
   }
 }
 
 void Widget::Hide() {
   native_widget_->Hide();
 }
 
 void Widget::ShowInactive() {
   // If this gets called with saved_show_state_ == ui::SHOW_STATE_MAXIMIZED,
@@ skipping 785 matching lines @@
       // If the saved bounds are valid, use them.
       SetBounds(saved_bounds);
     }
   } else {
     if (bounds.IsEmpty()) {
       // No initial bounds supplied, so size the window to its content and
       // center over its parent.
       native_widget_->CenterWindow(non_client_view_->GetPreferredSize());
     } else {
       // Use the supplied initial bounds.
+      if (IsMaximized())
+        initial_restored_bounds_ = bounds;
       SetBoundsConstrained(bounds);
     }
   }
 }
 
 void Widget::SetInitialBoundsForFramelessWindow(const gfx::Rect& bounds) {
   if (bounds.IsEmpty()) {
     View* contents_view = GetContentsView();
     DCHECK(contents_view);
     // No initial bounds supplied, so size the window to its content and
@@ skipping 27 matching lines @@
         bounds->set_width(minimum_size.width());
 
       if (bounds->height() < minimum_size.height())
         bounds->set_height(minimum_size.height());
     }
     return true;
   }
   return false;
 }
 
+void Widget::ShowWithCurrentState() {
+  ui::WindowShowState show_state =
+      IsFullscreen()
+          ? ui::SHOW_STATE_FULLSCREEN
+          : (IsMaximized() ? ui::SHOW_STATE_MAXIMIZED
+                           : (IsMinimized() ? ui::SHOW_STATE_MINIMIZED
+                                            : saved_show_state_));
+  native_widget_->ShowWithWindowState(show_state);
+}
+
 namespace internal {
 
 ////////////////////////////////////////////////////////////////////////////////
 // internal::NativeWidgetPrivate, NativeWidget implementation:
 
 internal::NativeWidgetPrivate* NativeWidgetPrivate::AsNativeWidgetPrivate() {
   return this;
 }
 
 }  // namespace internal
 }  // namespace views