Fixes bug where triggering session restore while the browser was...

chrome/browser/sessions/session_service.h

-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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 "base/callback.h"
@@ skipping 34 matching lines @@
 // of the browser.
 class SessionService : public BaseSessionService,
                        public NotificationObserver {
   friend class SessionServiceTestHelper;
  public:
   // Creates a SessionService for the specified profile.
   explicit SessionService(Profile* profile);
   // For testing.
   explicit SessionService(const FilePath& save_path);
 
+  // Invoke at a point when you think session restore might occur. For example,
+  // during startup and window creation this is invoked to see if a session
+  // needs to be restored. If a session needs to be restored it is done so
+  // asynchronously and true is returned. If false is returned the session was
+  // not restored and the caller needs to create a new window.
+  bool RestoreIfNecessary(const std::vector<GURL>& urls_to_open);
+
   // Resets the contents of the file from the current state of all open
   // browsers whose profile matches our profile.
   void ResetFromCurrentBrowsers();
 
   // Moves the current session to the last session. This is useful when a
   // checkpoint occurs, such as when the user launches the app and no tabbed
   // browsers are running.
   void MoveCurrentSessionToLastSession();
 
   // Associates a tab with a window.
@@ skipping 107 matching lines @@
     TYPE_NORMAL = 0,
     TYPE_POPUP = 1,
     TYPE_APP = 2,
     TYPE_APP_POPUP = TYPE_APP + TYPE_POPUP,
     TYPE_DEVTOOLS = TYPE_APP + 4,
     TYPE_APP_PANEL = TYPE_APP + 8
   };
 
   void Init();
 
+  // Implementation of RestoreIfNecessary. If |browser| is non-null and we need
+  // to restore, the tabs are added to it, otherwise a new browser is created.
+  bool RestoreIfNecessary(const std::vector<GURL>& urls_to_open,
+                          Browser* browser);
+
   virtual void Observe(NotificationType type,
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
   // Sets the application extension id of the specified tab.
   void SetTabAppExtensionID(const SessionID& window_id,
                             const SessionID& tab_id,
                             const std::string& app_extension_id);
 
   // Methods to create the various commands. It is up to the caller to delete
@@ skipping 210 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_