Mac: don't restore explicitly closed windows.

chrome/browser/sessions/session_service.cc

 // Copyright (c) 2006-2008 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 "build/build_config.h"
 
 #include "chrome/browser/sessions/session_service.h"
 
 #include <limits>
 
@@ skipping 220 matching lines @@
   // The window is about to close. If there are other tabbed browsers with the
   // same original profile commit the close immediately.
   //
   // NOTE: if the user chooses the exit menu item session service is destroyed
   // and this code isn't hit.
   if (has_open_trackable_browsers_) {
     // Closing a window can never make has_open_trackable_browsers_ go from
     // false to true, so only update it if already true.
     has_open_trackable_browsers_ = HasOpenTrackableBrowsers(window_id);
   }
-  if (!has_open_trackable_browsers_)
+  if (should_record_close_as_pending())
     pending_window_close_ids_.insert(window_id.id());
   else
     window_closing_ids_.insert(window_id.id());
 }
 
 void SessionService::WindowClosed(const SessionID& window_id) {
   if (!ShouldTrackChangesToWindow(window_id))
     return;
 
   windows_tracking_.erase(window_id.id());
 
   if (window_closing_ids_.find(window_id.id()) != window_closing_ids_.end()) {
     window_closing_ids_.erase(window_id.id());
     ScheduleCommand(CreateWindowClosedCommand(window_id.id()));
   } else if (pending_window_close_ids_.find(window_id.id()) ==
              pending_window_close_ids_.end()) {
     // We'll hit this if user closed the last tab in a window.
     has_open_trackable_browsers_ = HasOpenTrackableBrowsers(window_id);
-    if (!has_open_trackable_browsers_)
+    if (should_record_close_as_pending())
       pending_window_close_ids_.insert(window_id.id());
     else
       ScheduleCommand(CreateWindowClosedCommand(window_id.id()));
   }
 }
 
 void SessionService::SetWindowType(const SessionID& window_id,
                                    Browser::Type type) {
   if (!should_track_changes_for_browser_type(type))
     return;
@@ skipping 920 matching lines @@
     case TYPE_APP:
       return Browser::TYPE_APP;
     case TYPE_APP_POPUP:
       return Browser::TYPE_APP_POPUP;
     case TYPE_NORMAL:
     default:
       return Browser::TYPE_NORMAL;
   }
 }