Save and restore State for ShellWindows, including panels

chrome/browser/sessions/session_service.cc

Index: chrome/browser/sessions/session_service.cc
diff --git a/chrome/browser/sessions/session_service.cc b/chrome/browser/sessions/session_service.cc
index 85af48e9050536d599fc0fbeb31b1f686d7e93f9..0cace940b9e37c8f6268e807077df7b5a6e7a1a3 100644
--- a/chrome/browser/sessions/session_service.cc
+++ b/chrome/browser/sessions/session_service.cc
@@ -140,6 +140,7 @@ ui::WindowShowState AdjustShowState(ui::WindowShowState state) {
     case ui::SHOW_STATE_MINIMIZED:
     case ui::SHOW_STATE_MAXIMIZED:
     case ui::SHOW_STATE_FULLSCREEN:
+    case ui::SHOW_STATE_DETACHED:
       return state;
 
     case ui::SHOW_STATE_DEFAULT:
@@ -1348,16 +1349,10 @@ void SessionService::BuildCommandsForBrowser(
   DCHECK(browser && commands);
   DCHECK(browser->session_id().id());
 
-  ui::WindowShowState show_state = ui::SHOW_STATE_NORMAL;
-  if (browser->window()->IsMaximized())
-    show_state = ui::SHOW_STATE_MAXIMIZED;
-  else if (browser->window()->IsMinimized())
-    show_state = ui::SHOW_STATE_MINIMIZED;
-
   commands->push_back(
       CreateSetWindowBoundsCommand(browser->session_id(),
                                    browser->window()->GetRestoredBounds(),
-                                   show_state));
+                                   browser->window()->GetRestoredState()));
 
   commands->push_back(CreateSetWindowTypeCommand(
       browser->session_id(), WindowTypeForBrowserType(browser->type())));