android_webview/native/state_serializer.cc - Issue 2225343002: Navigation: move RestoreType and ReloadType into a separate file

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: android_webview/native/state_serializer.cc

Issue 2225343002: Navigation: move RestoreType and ReloadType into a separate file (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: [rebase] Created 4 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

Index: android_webview/native/state_serializer.cc

diff --git a/android_webview/native/state_serializer.cc b/android_webview/native/state_serializer.cc

index 69448f379ff1853fe8dfec9b96d4a59f17aba3e9..202e4473dc1d089107c3e2eb85536356cae5310a 100644

--- a/android_webview/native/state_serializer.cc

+++ b/android_webview/native/state_serializer.cc

@@ -12,6 +12,7 @@

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

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

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

+#include "content/public/browser/restore_type.h"

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

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

@@ -108,10 +109,9 @@ bool RestoreFromPickle(base::PickleIterator* iterator,

// |web_contents| takes ownership of these entries after this call.

content::NavigationController& controller = web_contents->GetController();

- controller.Restore(

- selected_entry,

- content::NavigationController::RESTORE_LAST_SESSION_EXITED_CLEANLY,

- &entries);

+ controller.Restore(selected_entry,

+ content::RestoreType::LAST_SESSION_EXITED_CLEANLY,

+ &entries);

DCHECK_EQ(0u, entries.size());

if (controller.GetLastCommittedEntry()) {

« no previous file with comments | « android_webview/browser/icon_helper.cc ('k') | chrome/browser/android/tab_state.cc » ('j') | no next file with comments »