content/renderer/history_controller.cc - Issue 1858533002: Introduce WebCachePolicy to merge cache policy enums

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: content/renderer/history_controller.cc

Issue 1858533002: Introduce WebCachePolicy to merge cache policy enums (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: self review, minor fixes Created 4 years, 9 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/renderer/chrome_content_renderer_client.cc ('K') | « content/renderer/history_controller.h ('k') | content/renderer/image_downloader/image_downloader_impl.cc » ('j') | content/renderer/render_frame_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/history_controller.cc

diff --git a/content/renderer/history_controller.cc b/content/renderer/history_controller.cc

index 0a6cd634f3546944f4ee4dc7a8bdad8bc6a80168..19ef0f5aa3219c6eaef7a01d48b518feb2527e55 100644

--- a/content/renderer/history_controller.cc

+++ b/content/renderer/history_controller.cc

@@ -44,6 +44,7 @@

#include "third_party/WebKit/public/web/WebFrameLoadType.h"

#include "third_party/WebKit/public/web/WebLocalFrame.h"

+using blink::WebCachePolicy;

using blink::WebFrame;

using blink::WebHistoryCommitType;

using blink::WebHistoryItem;

@@ -64,7 +65,7 @@ bool HistoryController::GoToEntry(

blink::WebLocalFrame* main_frame,

scoped_ptr<HistoryEntry> target_entry,

scoped_ptr<NavigationParams> navigation_params,

- WebURLRequest::CachePolicy cache_policy) {

+ WebCachePolicy cache_policy) {

DCHECK(!main_frame->parent());

HistoryFrameLoadVector same_document_loads;

HistoryFrameLoadVector different_document_loads;