Save and restore State for ShellWindows, including panels

chrome/browser/sessions/session_service.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/sessions/session_service.h"
 
 #include <algorithm>
 #include <set>
 #include <utility>
 #include <vector>
@@ skipping 122 matching lines @@
   bool pinned_state;
 };
 
 // Returns the show state to store to disk based |state|.
 ui::WindowShowState AdjustShowState(ui::WindowShowState state) {
   switch (state) {
     case ui::SHOW_STATE_NORMAL:
     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:
     case ui::SHOW_STATE_INACTIVE:
     case ui::SHOW_STATE_END:
       return ui::SHOW_STATE_NORMAL;
   }
   return ui::SHOW_STATE_NORMAL;
 }
 
@@ skipping 1188 matching lines @@
 }
 
 void SessionService::BuildCommandsForBrowser(
     Browser* browser,
     std::vector<SessionCommand*>* commands,
     IdToRange* tab_to_available_range,
     std::set<SessionID::id_type>* windows_to_track) {
   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())));
 
   if (!browser->app_name().empty()) {
     commands->push_back(CreateSetWindowAppNameCommand(
         kCommandSetWindowAppName,
         browser->session_id().id(),
         browser->app_name()));
   }
@@ skipping 390 matching lines @@
       contents->GetController().GetDefaultSessionStorageNamespace();
   session_storage_namespace->SetShouldPersist(false);
   SessionTabHelper* session_tab_helper =
       SessionTabHelper::FromWebContents(contents);
   TabClosed(session_tab_helper->window_id(),
             session_tab_helper->session_id(),
             contents->GetClosedByUserGesture());
   RecordSessionUpdateHistogramData(content::NOTIFICATION_WEB_CONTENTS_DESTROYED,
                                    &last_updated_tab_closed_time_);
 }