chrome/browser/sessions/session_restore.cc - Issue 658073004: Rewrites SerializedNavigationEntry to not have any //content member variables.

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_restore.cc

Issue 658073004: Rewrites SerializedNavigationEntry to not have any //content member variables. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebased. Created 6 years, 2 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

Index: chrome/browser/sessions/session_restore.cc

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

index 3764ac0b7b68cd3e991faa0b2d2fce4cd71039f8..bcace9b8a495d5bdd0cf6ffcef406ecb41ee3628 100644

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

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

@@ -48,6 +48,7 @@

#include "content/public/browser/session_storage_namespace.h"

#include "content/public/browser/storage_partition.h"

#include "content/public/browser/web_contents.h"

+#include "content/public/common/page_state.h"

#include "extensions/browser/extension_registry.h"

#include "extensions/common/extension_set.h"

#include "net/base/network_change_notifier.h"

@@ -1053,7 +1054,8 @@ class SessionRestoreImpl : public content::NotificationObserver {

// Set up the file access rights for the selected navigation entry.

const int id = web_contents->GetRenderProcessHost()->GetID();

const content::PageState& page_state =

- tab.navigations.at(selected_index).page_state();

+ content::PageState::CreateFromEncodedData(

+ tab.navigations.at(selected_index).encoded_page_state());

const std::vector<base::FilePath>& file_paths =

page_state.GetReferencedFiles();

for (std::vector<base::FilePath>::const_iterator file = file_paths.begin();

« no previous file with comments | « no previous file | chrome/browser/sessions/session_service_unittest.cc » ('j') | no next file with comments »