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

views/widget/native_widget_private.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_NATIVE_WIDGET_PRIVATE_H_
 #define VIEWS_WIDGET_NATIVE_WIDGET_PRIVATE_H_
 #pragma once
 
 #include "ui/gfx/native_widget_types.h"
 #include "views/ime/input_method_delegate.h"
@@ skipping 119 matching lines @@
   // Returns the InputMethod for this native widget.
   // Note that all widgets in a widget hierarchy share the same input method.
   // TODO(suzhe): rename to GetInputMethod() when NativeWidget implementation
   // class doesn't inherit Widget anymore.
   virtual InputMethod* CreateInputMethod() = 0;
 
 
   // Centers the window and sizes it to the specified size.
   virtual void CenterWindow(const gfx::Size& size) = 0;
 
-  // Retrieves the window's current restored bounds and "show" state, for
+  // Retrieves the window's current restored bounds and maximized state, for
   // persisting.
-  virtual void GetWindowPlacement(
-      gfx::Rect* bounds,
-      ui::WindowShowState* show_state) const = 0;
+  virtual void GetWindowBoundsAndMaximizedState(gfx::Rect* bounds,
+                                                bool* maximized) const = 0;
 
   // Sets the NativeWindow title.
   virtual void SetWindowTitle(const std::wstring& title) = 0;
 
   // Sets the Window icons. |window_icon| is a 16x16 icon suitable for use in
   // a title bar. |app_icon| is a larger size for use in the host environment
   // app switching UI.
   virtual void SetWindowIcons(const SkBitmap& window_icon,
                               const SkBitmap& app_icon) = 0;
 
   // Update native accessibility properties on the native window.
   virtual void SetAccessibleName(const std::wstring& name) = 0;
   virtual void SetAccessibleRole(ui::AccessibilityTypes::Role role) = 0;
   virtual void SetAccessibleState(ui::AccessibilityTypes::State state) = 0;
 
+  enum ShowState {
+    SHOW_RESTORED,
+    SHOW_MAXIMIZED,
+    SHOW_INACTIVE
+  };
+
   // Makes the NativeWindow modal.
   virtual void BecomeModal() = 0;
 
   // See method documentation in Widget.
   virtual gfx::Rect GetWindowScreenBounds() const = 0;
   virtual gfx::Rect GetClientAreaScreenBounds() const = 0;
   virtual gfx::Rect GetRestoredBounds() const = 0;
   virtual void SetBounds(const gfx::Rect& bounds) = 0;
   virtual void SetSize(const gfx::Size& size) = 0;
   virtual void SetBoundsConstrained(const gfx::Rect& bounds,
                                     Widget* other_widget) = 0;
   virtual void MoveAbove(gfx::NativeView native_view) = 0;
   virtual void MoveToTop() = 0;
   virtual void SetShape(gfx::NativeRegion shape) = 0;
   virtual void Close() = 0;
   virtual void CloseNow() = 0;
   virtual void EnableClose(bool enable) = 0;
   virtual void Show() = 0;
   virtual void Hide() = 0;
   // Invoked if the initial show should maximize the window. |restored_bounds|
   // is the bounds of the window when not maximized.
   virtual void ShowMaximizedWithBounds(const gfx::Rect& restored_bounds) = 0;
-  virtual void ShowWithWindowState(ui::WindowShowState show_state) = 0;
+  virtual void ShowWithState(ShowState state) = 0;
   virtual bool IsVisible() const = 0;
   virtual void Activate() = 0;
   virtual void Deactivate() = 0;
   virtual bool IsActive() const = 0;
   virtual void SetAlwaysOnTop(bool always_on_top) = 0;
   virtual void Maximize() = 0;
   virtual void Minimize() = 0;
   virtual bool IsMaximized() const = 0;
   virtual bool IsMinimized() const = 0;
   virtual void Restore() = 0;
@@ skipping 13 matching lines @@
       const Widget* ancestor, gfx::Point* point) const = 0;
 
   // Overridden from NativeWidget:
   virtual internal::NativeWidgetPrivate* AsNativeWidgetPrivate() OVERRIDE;
 };
 
 }  // namespace internal
 }  // namespace views
 
 #endif  // VIEWS_WIDGET_NATIVE_WIDGET_PRIVATE_H_