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

These changes enable save and restore of minimized window state on Windows.  (Mac and Linux came prior).  The window state is now saved whenever size-changed notifications fire (in addition to the original activation and close cases).

BUG=43274
TEST=Manual.  Launch Chrome on Windows, create two browser windows, minimize "a" window, quit.  Relaunch, expect "a" to be minimized.


Review URL: http://codereview.chromium.org/7748036

TBR=dhollowa@chromium.org
Review URL: http://codereview.chromium.org/7790010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98699 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 14 insertions, 10 deletions

diff --git a/views/desktop/desktop_views_delegate.cc b/views/desktop/desktop_views_delegate.cc
index b0f7ea2..6e64702 100644
--- a/views/desktop/desktop_views_delegate.cc
+++ b/views/desktop/desktop_views_delegate.cc
@@ -35,13 +35,17 @@ View* DesktopViewsDelegate::GetDefaultParentView() {
 void DesktopViewsDelegate::SaveWindowPlacement(const Widget* widget,
                                                const std::wstring& window_name,
                                                const gfx::Rect& bounds,
-                                               ui::WindowShowState show_state) {
+                                               bool maximized) {
 }
 
-bool DesktopViewsDelegate::GetSavedWindowPlacement(
+bool DesktopViewsDelegate::GetSavedWindowBounds(const std::wstring& window_name,
+                                                gfx::Rect* bounds) const {
+  return false;
+}
+
+bool DesktopViewsDelegate::GetSavedMaximizedState(
     const std::wstring& window_name,
-    gfx::Rect* bounds,
-    ui::WindowShowState* show_state) const {
+    bool* maximized) const {
   return false;
 }
 
diff --git a/views/desktop/desktop_views_delegate.h b/views/desktop/desktop_views_delegate.h
index 1704a97..145a29f 100644
--- a/views/desktop/desktop_views_delegate.h
+++ b/views/desktop/desktop_views_delegate.h
@@ -23,11 +23,11 @@ class DesktopViewsDelegate : public ViewsDelegate {
   virtual void SaveWindowPlacement(const Widget* widget,
                                    const std::wstring& window_name,
                                    const gfx::Rect& bounds,
-                                   ui::WindowShowState show_state) OVERRIDE;
-  virtual bool GetSavedWindowPlacement(
-      const std::wstring& window_name,
-      gfx::Rect* bounds,
-      ui::WindowShowState* show_state) const OVERRIDE;
+                                   bool maximized) OVERRIDE;
+  virtual bool GetSavedWindowBounds(const std::wstring& window_name,
+                                    gfx::Rect* bounds) const OVERRIDE;
+  virtual bool GetSavedMaximizedState(const std::wstring& window_name,
+                                      bool* maximized) const OVERRIDE;
   virtual void NotifyAccessibilityEvent(
       views::View* view, ui::AccessibilityTypes::Event event_type) OVERRIDE;
   virtual void NotifyMenuItemFocused(
diff --git a/views/desktop/desktop_window_view.cc b/views/desktop/desktop_window_view.cc
index f3033b2..dcd8a6a 100644
--- a/views/desktop/desktop_window_view.cc
+++ b/views/desktop/desktop_window_view.cc
@@ -135,7 +135,7 @@ void DesktopWindowView::CreateDesktopWindow(DesktopType type) {
   params.native_widget = new views::NativeWidgetWayland(window);
 #elif defined(TOOLKIT_USES_GTK)
   params.native_widget = new views::NativeWidgetGtk(window);
-  params.show_state = ui::SHOW_STATE_MAXIMIZED;
+  params.maximize = true;
 #endif
   params.bounds = gfx::Rect(20, 20, 1920, 1200);
   window->Init(params);