chrome/browser/sessions/session_service.cc - Issue 10831116: Move SessionStorageNamespace entirely into NavigationController and support StoragePartitions.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 10831116: Move SessionStorageNamespace entirely into NavigationController and support StoragePartitions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix content shell Created 8 years, 5 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

« chrome/browser/instant/instant_loader.cc ('K') | « chrome/browser/sessions/session_restore_browsertest.cc ('k') | chrome/browser/sessions/tab_restore_service.cc » ('j') | chrome/browser/ui/browser_tabstrip.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sessions/session_service.cc

diff --git a/chrome/browser/sessions/session_service.cc b/chrome/browser/sessions/session_service.cc

index 71879f858774681551a4c7c96b2a8d40e5c4a0d3..caf5475a627844324d056f94c845f3d3cb57e56a 100644

--- a/chrome/browser/sessions/session_service.cc

+++ b/chrome/browser/sessions/session_service.cc

@@ -606,7 +606,8 @@ void SessionService::Observe(int type,

// Record the association between the SessionStorageNamespace and the

// tab.

content::SessionStorageNamespace* session_storage_namespace =

- tab->web_contents()->GetController().GetSessionStorageNamespace();

+ tab->web_contents()->GetController().GetSessionStorageNamespaceMap()

+ .find("")->second;

ScheduleCommand(CreateSessionStorageAssociatedCommand(

tab->restore_tab_helper()->session_id(),

session_storage_namespace->persistent_id()));

@@ -621,7 +622,8 @@ void SessionService::Observe(int type,

// Allow the associated sessionStorage to get deleted; it won't be needed

// in the session restore.

content::SessionStorageNamespace* session_storage_namespace =

- tab->web_contents()->GetController().GetSessionStorageNamespace();

+ tab->web_contents()->GetController().GetSessionStorageNamespaceMap()

+ .find("")->second;

session_storage_namespace->SetShouldPersist(false);

TabClosed(tab->restore_tab_helper()->window_id(),

tab->restore_tab_helper()->session_id(),

@@ -1346,7 +1348,8 @@ void SessionService::BuildCommandsForTab(

// Record the association between the sessionStorage namespace and the tab.

content::SessionStorageNamespace* session_storage_namespace =

- tab->web_contents()->GetController().GetSessionStorageNamespace();

+ tab->web_contents()->GetController().GetSessionStorageNamespaceMap()

+ .find("")->second;

ScheduleCommand(CreateSessionStorageAssociatedCommand(

tab->restore_tab_helper()->session_id(),

session_storage_namespace->persistent_id()));