Mac: don't restore explicitly closed windows.

chrome/browser/sessions/session_service.h

 // 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.
 
 #ifndef CHROME_BROWSER_SESSIONS_SESSION_SERVICE_H_
 #define CHROME_BROWSER_SESSIONS_SESSION_SERVICE_H_
 
 #include <map>
 
 #include "base/basictypes.h"
 #include "chrome/browser/browser.h"
+#include "chrome/browser/browser_list.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/sessions/base_session_service.h"
 #include "chrome/browser/sessions/session_id.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
 
 class Browser;
 class NavigationController;
 class NavigationEntry;
 class Profile;
@@ skipping 301 matching lines @@
 
   // Returns true if changes to tabs in the specified window should be tracked.
   bool ShouldTrackChangesToWindow(const SessionID& window_id);
 
   // Returns true if we track changes to the specified browser type.
   static bool should_track_changes_for_browser_type(Browser::Type type) {
     return type == Browser::TYPE_NORMAL ||
         (type == Browser::TYPE_POPUP && browser_defaults::kRestorePopups);
   }
 
+  // Returns true if we should record a window close as pending.
+  // |has_open_trackable_browsers_| must be up-to-date before calling this.
+  bool should_record_close_as_pending() const {
+    // When this is called, the browser window being closed is still open, hence
+    // still in the browser list. If there is a browser window other than the
+    // one being closed but no trackable windows, then the others must be App
+    // windows or similar. In this case, we record the close as pending.
+    return !has_open_trackable_browsers_ &&
+        (!browser_defaults::kBrowserAliveWithNoWindows ||
+         BrowserList::size() > 1);
+    }
+
   // Convert back/forward between the Browser and SessionService DB window
   // types.
   static WindowType WindowTypeForBrowserType(Browser::Type type);
   static Browser::Type BrowserTypeForWindowType(WindowType type);
 
   NotificationRegistrar registrar_;
 
   // Maps from session tab id to the range of navigation entries that has
   // been written to disk.
   //
@@ skipping 29 matching lines @@
   // If true and a new tabbed browser is created and there are no opened tabbed
   // browser (has_open_trackable_browsers_ is false), then the current session
   // is made the previous session. See description above class for details on
   // current/previou session.
   bool move_on_new_browser_;
 
   DISALLOW_COPY_AND_ASSIGN(SessionService);
 };
 
 #endif  // CHROME_BROWSER_SESSIONS_SESSION_SERVICE_H_