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

chrome/browser/sessions/session_restore.cc

-// 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.
 
 #include "chrome/browser/sessions/session_restore.h"
 
 #include <vector>
 
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/scoped_ptr.h"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/extensions/extensions_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/sessions/session_service.h"
 #include "chrome/browser/sessions/session_types.h"
 #include "chrome/browser/tab_contents/navigation_controller.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tab_contents/tab_contents_view.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/notification_registrar.h"
 #include "chrome/common/notification_service.h"
 
+// Are we in the process of restoring?
+static bool restoring = false;
+
 namespace {
 
 // TabLoader ------------------------------------------------------------------
 
 // TabLoader is responsible for ensuring after session restore we have
 // at least SessionRestore::num_tabs_to_load_ loading. As tabs finish loading
 // new tabs are loaded. When all tabs are loading TabLoader deletes itself.
 //
 // This is not part of SessionRestoreImpl so that synchronous destruction
 // of SessionRestoreImpl doesn't have timing problems.
@@ skipping 165 matching lines @@
     }
 
     if (browser_) {
       registrar_.Add(this, NotificationType::BROWSER_CLOSED,
                      Source<Browser>(browser_));
     }
   }
 
   ~SessionRestoreImpl() {
     STLDeleteElements(&windows_);
+    restoring = false;
   }
 
   virtual void Observe(NotificationType type,
                        const NotificationSource& source,
                        const NotificationDetails& details) {
     switch (type.value) {
       case NotificationType::BROWSER_CLOSED:
         delete this;
         return;
 
@@ skipping 271 matching lines @@
                     bool always_create_tabbed_browser,
                     const std::vector<GURL>& urls_to_open) {
   DCHECK(profile);
   // Always restore from the original profile (incognito profiles have no
   // session service).
   profile = profile->GetOriginalProfile();
   if (!profile->GetSessionService()) {
     NOTREACHED();
     return;
   }
+  restoring = true;
   profile->set_restored_last_session(true);
   // SessionRestoreImpl takes care of deleting itself when done.
   SessionRestoreImpl* restorer =
       new SessionRestoreImpl(profile, browser, synchronous,
                              clobber_existing_window,
                              always_create_tabbed_browser, urls_to_open);
   restorer->Restore();
 }
 
 // static
 void SessionRestore::RestoreSession(Profile* profile,
                                     Browser* browser,
                                     bool clobber_existing_window,
                                     bool always_create_tabbed_browser,
                                     const std::vector<GURL>& urls_to_open) {
   Restore(profile, browser, false, clobber_existing_window,
           always_create_tabbed_browser, urls_to_open);
 }
 
 // static
 void SessionRestore::RestoreSessionSynchronously(
     Profile* profile,
     const std::vector<GURL>& urls_to_open) {
   Restore(profile, NULL, true, false, true, urls_to_open);
 }
+
+// static
+bool SessionRestore::IsRestoring() {
+  return restoring;
+}