chrome/browser/web_applications/web_app.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: chrome/browser/web_applications/web_app.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: chrome/browser/web_applications/web_app.cc

diff --git a/chrome/browser/web_applications/web_app.cc b/chrome/browser/web_applications/web_app.cc

index 313e261886555939c2a2b6fec826a81f97149743..a588a94ba2bc5f3008fabddc51624fec76406a4d 100644

--- a/chrome/browser/web_applications/web_app.cc

+++ b/chrome/browser/web_applications/web_app.cc

@@ -442,8 +442,8 @@ bool IsValidUrl(const GURL& url) {

content::kFileScheme,

content::kFileSystemScheme,

content::kFtpScheme,

- content::kHttpScheme,

- content::kHttpsScheme,

+ url::kHttpScheme,

+ url::kHttpsScheme,

extensions::kExtensionScheme,

};