content/browser/frame_host/navigation_controller_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/browser/frame_host/navigation_controller_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/browser/frame_host/navigation_controller_impl.cc

diff --git a/content/browser/frame_host/navigation_controller_impl.cc b/content/browser/frame_host/navigation_controller_impl.cc

index 4fa5f0883f6b4e12bb3403cfdfdabe0ea4d04846..79e2c7b478ca89c52a53ec2bdc079c29fddcdae3 100644

--- a/content/browser/frame_host/navigation_controller_impl.cc

+++ b/content/browser/frame_host/navigation_controller_impl.cc

@@ -654,8 +654,8 @@ void NavigationControllerImpl::LoadURLWithParams(const LoadURLParams& params) {

case LOAD_TYPE_DEFAULT:

break;

case LOAD_TYPE_BROWSER_INITIATED_HTTP_POST:

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

- !params.url.SchemeIs(kHttpsScheme)) {

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

+ !params.url.SchemeIs(url::kHttpsScheme)) {

NOTREACHED() << "Http post load must use http(s) scheme.";

return;

}