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

chrome/browser/sessions/session_service.cc

 // 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.
 
 #include "build/build_config.h"
 
 #include "chrome/browser/sessions/session_service.h"
 
 #include <limits>
 
@@ skipping 127 matching lines @@
     : BaseSessionService(SESSION_RESTORE, NULL, save_path),
       has_open_trackable_browsers_(false),
       move_on_new_browser_(false) {
   Init();
 }
 
 SessionService::~SessionService() {
   Save();
 }
 
+bool SessionService::RestoreIfNecessary(const std::vector<GURL>& urls_to_open) {
+  return RestoreIfNecessary(urls_to_open, NULL);
+}
+
 void SessionService::ResetFromCurrentBrowsers() {
   ScheduleReset();
 }
 
 void SessionService::MoveCurrentSessionToLastSession() {
   pending_tab_close_ids_.clear();
   window_closing_ids_.clear();
   pending_window_close_ids_.clear();
 
   Save();
@@ skipping 274 matching lines @@
                  NotificationService::AllSources());
   registrar_.Add(this, NotificationType::NAV_ENTRY_COMMITTED,
                  NotificationService::AllSources());
   registrar_.Add(this, NotificationType::BROWSER_OPENED,
                  NotificationService::AllSources());
   registrar_.Add(this,
                  NotificationType::TAB_CONTENTS_APPLICATION_EXTENSION_CHANGED,
                  NotificationService::AllSources());
 }
 
+bool SessionService::RestoreIfNecessary(const std::vector<GURL>& urls_to_open,
+                                        Browser* browser) {
+  if (!has_open_trackable_browsers_ && !BrowserInit::InProcessStartup() &&
+      !SessionRestore::IsRestoring()
+#if defined(OS_MACOSX)
+      // OSX has a fairly different idea of application lifetime than the
+      // other platforms. We need to check that we aren't opening a window
+      // from the dock or the menubar.
+      && !app_controller_mac::IsOpeningNewWindow()
+#endif
+      ) {
+    // We're going from no tabbed browsers to a tabbed browser (and not in
+    // process startup), restore the last session.
+    if (move_on_new_browser_) {
+      // Make the current session the last.
+      MoveCurrentSessionToLastSession();
+      move_on_new_browser_ = false;
+    }
+    SessionStartupPref pref = SessionStartupPref::GetStartupPref(profile());
+    if (pref.type == SessionStartupPref::LAST) {
+      SessionRestore::RestoreSession(
+          profile(), browser, false, browser ? false : true, urls_to_open);
+      return true;
+    }
+  }
+  return false;
+}
+
 void SessionService::Observe(NotificationType type,
                              const NotificationSource& source,
                              const NotificationDetails& details) {
   // All of our messages have the NavigationController as the source.
   switch (type.value) {
     case NotificationType::BROWSER_OPENED: {
       Browser* browser = Source<Browser>(source).ptr();
       if (browser->profile() != profile() ||
           !should_track_changes_for_browser_type(browser->type())) {
         return;
       }
 
-      if (!has_open_trackable_browsers_ && !BrowserInit::InProcessStartup()
-#if defined(OS_MACOSX)
-          // OSX has a fairly different idea of application lifetime than the
-          // other platforms. We need to check that we aren't opening a window
-          // from the dock or the menubar.
-          && !app_controller_mac::IsOpeningNewWindow()
-#endif
-          ) {
-        // We're going from no tabbed browsers to a tabbed browser (and not in
-        // process startup), restore the last session.
-        if (move_on_new_browser_) {
-          // Make the current session the last.
-          MoveCurrentSessionToLastSession();
-          move_on_new_browser_ = false;
-        }
-        SessionStartupPref pref = SessionStartupPref::GetStartupPref(profile());
-        if (pref.type == SessionStartupPref::LAST) {
-          SessionRestore::RestoreSession(
-              profile(), browser, false, false, std::vector<GURL>());
-        }
-      }
+      RestoreIfNecessary(std::vector<GURL>(), browser);
       SetWindowType(browser->session_id(), browser->type());
       break;
     }
 
     case NotificationType::TAB_PARENTED: {
       NavigationController* controller =
           Source<NavigationController>(source).ptr();
       SetTabWindow(controller->window_id(), controller->session_id());
       if (controller->tab_contents()->app_extension()) {
         SetTabAppExtensionID(
@@ skipping 799 matching lines @@
       return Browser::TYPE_APP_POPUP;
     case TYPE_DEVTOOLS:
       return Browser::TYPE_DEVTOOLS;
     case TYPE_APP_PANEL:
       return Browser::TYPE_APP_PANEL;
     case TYPE_NORMAL:
     default:
       return Browser::TYPE_NORMAL;
   }
 }