Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4990)

Unified Diff: chrome/browser/sessions/tab_restore_service.cc

Issue 3325012: Fix SessionStorage (Closed)
Patch Set: kill the last (new) dcheck Created 10 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/sessions/tab_restore_service.h ('k') | chrome/browser/sidebar/sidebar_container.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sessions/tab_restore_service.cc
diff --git a/chrome/browser/sessions/tab_restore_service.cc b/chrome/browser/sessions/tab_restore_service.cc
index c62312aa94141900602041bdeed8f52a5f0b253a..23b7470e5c5ae7ebc8c5d07e3992fa04b7100b1b 100644
--- a/chrome/browser/sessions/tab_restore_service.cc
+++ b/chrome/browser/sessions/tab_restore_service.cc
@@ -338,7 +338,8 @@ void TabRestoreService::RestoreEntryById(Browser* browser,
tab.extension_app_id,
(static_cast<int>(tab_i) ==
window->selected_tab_index),
- tab.pinned, tab.from_last_session);
+ tab.pinned, tab.from_last_session,
+ tab.session_storage_namespace);
if (restored_tab)
restored_tab->controller().LoadIfNecessary();
}
@@ -476,6 +477,8 @@ void TabRestoreService::PopulateTab(Tab* tab,
if (extension)
tab->extension_app_id = extension->id();
+ tab->session_storage_namespace = controller->session_storage_namespace();
+
// Browser may be NULL during unit tests.
if (browser) {
tab->browser_id = browser->session_id().id();
@@ -866,7 +869,8 @@ Browser* TabRestoreService::RestoreTab(const Tab& tab,
browser->ReplaceRestoredTab(tab.navigations,
tab.current_navigation_index,
tab.from_last_session,
- tab.extension_app_id);
+ tab.extension_app_id,
+ tab.session_storage_namespace);
} else {
if (tab.has_browser())
browser = BrowserList::FindBrowserWithID(tab.browser_id);
@@ -889,7 +893,8 @@ Browser* TabRestoreService::RestoreTab(const Tab& tab,
tab_index,
tab.current_navigation_index,
tab.extension_app_id,
- true, tab.pinned, tab.from_last_session);
+ true, tab.pinned, tab.from_last_session,
+ tab.session_storage_namespace);
}
return browser;
}
« no previous file with comments | « chrome/browser/sessions/tab_restore_service.h ('k') | chrome/browser/sidebar/sidebar_container.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698