chrome/browser/google/google_util.cc - Issue 23064011: Consolidate scheme checks into an easy GURL method

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/google/google_util.cc

Issue 23064011: Consolidate scheme checks into an easy GURL method (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 7 years, 4 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/google/google_util.cc

diff --git a/chrome/browser/google/google_util.cc b/chrome/browser/google/google_util.cc

index d14ec5a23e68ed363556f4f95a3cff2698c44149..99e4b7a038f64a539c70f1f41e7e77a9ba7b3f0b 100644

--- a/chrome/browser/google/google_util.cc

+++ b/chrome/browser/google/google_util.cc

@@ -186,7 +186,7 @@ bool IsGoogleHostname(const std::string& host,

bool IsGoogleDomainUrl(const GURL& url,

SubdomainPermission subdomain_permission,

PortPermission port_permission) {

- return url.is_valid() && (url.SchemeIs("http") || url.SchemeIs("https")) &&

+ return url.is_valid() && url.SchemeIsHTTPOrHTTPS() &&

(url.port().empty() || (port_permission == ALLOW_NON_STANDARD_PORTS)) &&

google_util::IsGoogleHostname(url.host(), subdomain_permission);

}