Persist sessionStorage on disk.

chrome/browser/ui/startup/session_crashed_prompt.cc

 // Copyright (c) 2012 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/ui/startup/session_crashed_prompt.h"
 
 #include "chrome/browser/infobars/infobar_tab_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/session_restore.h"
 #include "chrome/browser/tab_contents/confirm_infobar_delegate.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/url_constants.h"
+#include "content/public/browser/browser_context.h"
+#include "content/public/browser/notification_service.h"
+#include "content/public/browser/dom_storage_context.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "grit/theme_resources_standard.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
 namespace {
 
 // A delegate for the InfoBar shown when the previous session has crashed.
-class SessionCrashedInfoBarDelegate : public ConfirmInfoBarDelegate {
+class SessionCrashedInfoBarDelegate : public ConfirmInfoBarDelegate,
+                                      public content::NotificationObserver {
  public:
   SessionCrashedInfoBarDelegate(Profile* profile,
                                 InfoBarTabHelper* infobar_helper);
 
  private:
   virtual ~SessionCrashedInfoBarDelegate();
 
   // ConfirmInfoBarDelegate:
   virtual gfx::Image* GetIcon() const OVERRIDE;
   virtual string16 GetMessageText() const OVERRIDE;
   virtual int GetButtons() const OVERRIDE;
   virtual string16 GetButtonLabel(InfoBarButton button) const OVERRIDE;
   virtual bool Accept() OVERRIDE;
 
+  // content::NotificationObserver implementation.
+  virtual void Observe(int type,
+                       const content::NotificationSource& source,
+                       const content::NotificationDetails& details) OVERRIDE;
+
   // The Profile that we restore sessions from.
   Profile* profile_;
+  content::NotificationRegistrar registrar_;
+  bool accepted_;
 
   DISALLOW_COPY_AND_ASSIGN(SessionCrashedInfoBarDelegate);
 };
 
 SessionCrashedInfoBarDelegate::SessionCrashedInfoBarDelegate(
     Profile* profile,
     InfoBarTabHelper* infobar_helper)
     : ConfirmInfoBarDelegate(infobar_helper),
-      profile_(profile) {
+      profile_(profile),
+      accepted_(false) {
+  registrar_.Add(this, chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_REMOVED,
+                 content::NotificationService::AllSources());
 }
 
 SessionCrashedInfoBarDelegate::~SessionCrashedInfoBarDelegate() {
 }
 
 gfx::Image* SessionCrashedInfoBarDelegate::GetIcon() const {
   return &ResourceBundle::GetSharedInstance().GetNativeImageNamed(
       IDR_INFOBAR_RESTORE_SESSION);
 }
 
@@ skipping 16 matching lines @@
   Browser* browser = browser::FindLastActiveWithProfile(profile_);
   if (browser && browser->tab_count() == 1
       && browser->GetWebContentsAt(0)->GetURL() ==
       GURL(chrome::kChromeUINewTabURL)) {
     // There is only one tab and its the new tab page, make session restore
     // clobber it.
     behavior = SessionRestore::CLOBBER_CURRENT_TAB;
   }
   SessionRestore::RestoreSession(
       profile_, browser, behavior, std::vector<GURL>());
+  accepted_ = true;
   return true;
 }
 
+void SessionCrashedInfoBarDelegate::Observe(
+    int type,
+    const content::NotificationSource& source,
+    const content::NotificationDetails& details) {
+  switch (type) {
+    case chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_REMOVED:
+      // If the info bar wasn't accepted, it was either dismissed or expired. In
+      // that case, session restore won't happen.
+      if (!accepted_) {
+        content::DOMStorageContext* dom_storage_context =
+            content::BrowserContext::GetDOMStorageContext(profile_);
+        dom_storage_context->StartScavengingUnusedSessionStorage();
+      }
+      break;
+    default:
+      NOTREACHED();
+      break;
+  }
+}
+
 }  // namespace
 
 
 namespace browser {
 
 void ShowSessionCrashedPrompt(Browser* browser) {
   // Assume that if the user is launching incognito they were previously
   // running incognito so that we have nothing to restore from.
   if (browser->profile()->IsOffTheRecord())
     return;
 
   // In ChromeBot tests, there might be a race. This line appears to get
   // called during shutdown and |tab| can be NULL.
   TabContents* tab = browser->GetActiveTabContents();
   if (!tab)
     return;
 
   // Don't show the info-bar if there are already info-bars showing.
   if (tab->infobar_tab_helper()->infobar_count() > 0)
     return;
 
   tab->infobar_tab_helper()->AddInfoBar(
       new SessionCrashedInfoBarDelegate(browser->profile(),
                                         tab->infobar_tab_helper()));
 }
 
 }  // namespace browser
-