Restoring a session should restore window minimization state on Windows

chrome/browser/ui/views/frame/browser_view.cc

Index: chrome/browser/ui/views/frame/browser_view.cc
diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc
index 59c87a70eecd133d919c5d0e87d76979872478c9..98dd3f582243e365887104586c21bf01c4db338f 100644
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -790,9 +790,7 @@ bool BrowserView::IsMaximized() const {
 }
 
 bool BrowserView::IsMinimized() const {
-  // TODO(dhollowa): Add support for session restore of minimized state.
-  // http://crbug.com/43274
-  return false;
+  return frame_->IsMinimized();
 }
 
 void BrowserView::SetFullscreen(bool fullscreen) {
@@ -1634,23 +1632,22 @@ std::wstring BrowserView::GetWindowName() const {
 }
 
 void BrowserView::SaveWindowPlacement(const gfx::Rect& bounds,
-                                      bool maximized) {
-  // TODO(dhollowa): Add support for session restore of minimized state.
-  // http://crbug.com/43274
-
+                                      ui::WindowShowState show_state) {
   // If IsFullscreen() is true, we've just changed into fullscreen mode, and
   // we're catching the going-into-fullscreen sizing and positioning calls,
   // which we want to ignore.
   if (!IsFullscreen() && browser_->ShouldSaveWindowPlacement()) {
-    WidgetDelegate::SaveWindowPlacement(bounds, maximized);
-    browser_->SaveWindowPlacement(bounds,
-                                  maximized ? ui::SHOW_STATE_MAXIMIZED :
-                                              ui::SHOW_STATE_NORMAL);
+    WidgetDelegate::SaveWindowPlacement(bounds, show_state);
+    browser_->SaveWindowPlacement(bounds, show_state);
   }
 }
 
-bool BrowserView::GetSavedWindowBounds(gfx::Rect* bounds) const {
+bool BrowserView::GetSavedWindowPlacement(
+    gfx::Rect* bounds,
+    ui::WindowShowState* show_state) const {
   *bounds = browser_->GetSavedWindowBounds();
+  *show_state = browser_->GetSavedWindowShowState();
+
   if (browser_->is_type_popup() || browser_->is_type_panel()) {
     // We are a popup window. The value passed in |bounds| represents two
     // pieces of information:
@@ -1688,13 +1685,6 @@ bool BrowserView::GetSavedWindowBounds(gfx::Rect* bounds) const {
   return true;
 }
 
-bool BrowserView::GetSavedMaximizedState(bool* maximized) const {
-  // TODO(dhollowa): Add support for session restore of minimized state.
-  // http://crbug.com/43274
-  *maximized = browser_->GetSavedWindowShowState() == ui::SHOW_STATE_MAXIMIZED;
-  return true;
-}
-
 views::View* BrowserView::GetContentsView() {
   return contents_container_;
 }