Revert 98679 - Restoring a session should restore window minimization state on Windows

views/widget/widget.h

 // Copyright (c) 2011 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.
 
 #ifndef VIEWS_WIDGET_WIDGET_H_
 #define VIEWS_WIDGET_WIDGET_H_
 #pragma once
 
 #include <stack>
 
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "ui/base/accessibility/accessibility_types.h"
-#include "ui/base/ui_base_types.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/rect.h"
 #include "views/focus/focus_manager.h"
 #include "views/widget/native_widget_delegate.h"
 #include "views/window/client_view.h"
 #include "views/window/non_client_view.h"
 
 #if defined(OS_WIN)
 // Windows headers define macros for these function names which screw with us.
 #if defined(IsMaximized)
@@ skipping 112 matching lines @@
     WidgetDelegate* delegate;
     bool child;
     bool transient;
     bool transparent;
     bool accept_events;
     bool can_activate;
     bool keep_on_top;
     Ownership ownership;
     bool mirror_origin_in_rtl;
     bool has_dropshadow;
-    // Whether the widget should be maximized or minimized.
-    ui::WindowShowState show_state;
+    // Whether the widget should be maximized.
+    bool maximize;
     // Should the widget be double buffered? Default is false.
     bool double_buffer;
     gfx::NativeView parent;
     Widget* parent_widget;
     // Specifies the initial bounds of the Widget. Default is empty, which means
     // the NativeWidget may specify a default size.
     gfx::Rect bounds;
     // When set, this value is used as the Widget's NativeWidget implementation.
     // The Widget will not construct a default one. Default is NULL.
     NativeWidget* native_widget;
@@ skipping 469 matching lines @@
   gfx::Point last_mouse_event_position_;
 
  private:
   friend class NativeTextfieldViewsTest;
   friend class NativeComboboxViewsTest;
   friend class ScopedEvent;
 
   // Returns whether capture should be released on mouse release.
   virtual bool ShouldReleaseCaptureOnMouseReleased() const;
 
-  // Persists the window's restored position and "show" state using the
+  // Persists the window's restored position and maximized state using the
   // window delegate.
-  void SaveWindowPlacement();
+  void SaveWindowPosition();
 
   // Sizes and positions the window just after it is created.
   void SetInitialBounds(const gfx::Rect& bounds);
 
-  // Returns the bounds and "show" state from the delegate. Returns true if
+  // Returns the bounds and maximized state from the delegate. Returns true if
   // the delegate wants to use a specified bounds.
-  bool GetSavedWindowPlacement(gfx::Rect* bounds,
-                               ui::WindowShowState* show_state);
+  bool GetSavedBounds(gfx::Rect* bounds, bool* maximize);
 
   // Sets a different InputMethod instance to this widget. The instance
   // must not be initialized, the ownership will be assumed by the widget.
   // It's only for testing purpose.
   void ReplaceInputMethod(InputMethod* input_method);
 
   internal::NativeWidgetPrivate* native_widget_;
 
   ObserverList<Observer> observers_;
 
@@ skipping 38 matching lines @@
   // FRAME_TYPE_DEFAULT.
   FrameType frame_type_;
 
   // True when the window should be rendered as active, regardless of whether
   // or not it actually is.
   bool disable_inactive_rendering_;
 
   // Set to true if the widget is in the process of closing.
   bool widget_closed_;
 
-  // The saved "show" state for this window. See note in SetInitialBounds
+  // The saved maximized state for this window. See note in SetInitialBounds
   // that explains why we save this.
-  ui::WindowShowState saved_show_state_;
+  bool saved_maximized_state_;
 
   // The restored bounds used for the initial show. This is only used if
-  // |saved_show_state_| is maximized.
+  // |saved_maximized_state_| is true.
   gfx::Rect initial_restored_bounds_;
 
   // The smallest size the window can be.
   gfx::Size minimum_size_;
 
   // Focus is automatically set to the view provided by the delegate
   // when the widget is shown. Set this value to false to override
   // initial focus for the widget.
   bool focus_on_creation_;
 
   scoped_ptr<InputMethod> input_method_;
 
   // See |is_top_leve()| accessor.
   bool is_top_level_;
 
   // Factory used to create Compositors. Settable by tests.
   static ui::Compositor*(*compositor_factory_)();
 
-  // Tracks whether native widget has been created.
-  bool native_widget_created_;
-
   DISALLOW_COPY_AND_ASSIGN(Widget);
 };
 
 }  // namespace views
 
 #endif // VIEWS_WIDGET_WIDGET_H_