content/renderer/render_frame_impl.cc - Issue 254763005: Move some content url constants to /url.

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/render_frame_impl.cc

Issue 254763005: Move some content url constants to /url. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Resolve a merge conflict. Created 6 years, 7 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:

Index: content/renderer/render_frame_impl.cc

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

index 2141f47944ee52b0a6335879a24630103e78ca7f..89590374dae94e3c8b77e8694ebb2f5e8d6c16d1 100644

--- a/content/renderer/render_frame_impl.cc

+++ b/content/renderer/render_frame_impl.cc

@@ -295,7 +295,7 @@ static bool IsNonLocalTopLevelNavigation(const GURL& url,

// 2. The origin of the url and the opener is the same in which case the

// opener relationship is maintained.

// 3. Reloads/form submits/back forward navigations

- if (!url.SchemeIs(kHttpScheme) && !url.SchemeIs(kHttpsScheme))

+ if (!url.SchemeIs(url::kHttpScheme) && !url.SchemeIs(url::kHttpsScheme))

return false;

if (type != blink::WebNavigationTypeReload &&

« no previous file with comments | « content/renderer/media/buffered_resource_loader.cc ('k') | extensions/common/url_pattern.cc » ('j') | no next file with comments »