Chromium Code Reviews| Index: url/gurl.h |
| diff --git a/url/gurl.h b/url/gurl.h |
| index 566fc5e18317f899738a705c310c81b03ec13b7a..6c8b6a623789deb3e6fd542aa05a8d53fa8bb9e4 100644 |
| --- a/url/gurl.h |
| +++ b/url/gurl.h |
| @@ -223,10 +223,24 @@ class URL_EXPORT GURL { |
| return SchemeIs(url::kFileSystemScheme); |
| } |
| - // If the scheme indicates a secure connection |
| + // Returns true if the scheme indicates a secure connection. |
| + // |
| + // NOTE: This function is deprecated. You probably want |SchemeUsesTLS| or |
| + // Chromium's |content::IsOriginSecure|. |
|
felt
2015/04/08 00:10:08
Can you add an explanation of when to use which on
palmer
2015/04/08 00:50:07
Done.
|
| + // |
| + // TODO(palmer): Audit callers and change them to |SchemeUsesTLS| or |
| + // |content::IsOriginSecure|, as appropriate. Then remove |SchemeIsSecure|. |
| + // crbug.com/362214 |
| bool SchemeIsSecure() const { |
| return SchemeIs(url::kHttpsScheme) || SchemeIs(url::kWssScheme) || |
| - (SchemeIsFileSystem() && inner_url() && inner_url()->SchemeIsSecure()); |
| + (SchemeIsFileSystem() && inner_url() && |
| + inner_url()->SchemeIsSecure()); |
| + } |
| + |
| + // Returns true if the scheme indicates a network connection that uses TLS for |
| + // security. |
|
felt
2015/04/08 00:10:08
Can you add a note here saying you might want cont
palmer
2015/04/08 00:50:07
Done.
|
| + bool SchemeUsesTLS() const { |
| + return SchemeIs(url::kHttpsScheme) || SchemeIs(url::kWssScheme); |
| } |
| // Returns true if the scheme is "blob". |
| @@ -241,7 +255,6 @@ class URL_EXPORT GURL { |
| // Returns true if the hostname is an IP address. Note: this function isn't |
| // as cheap as a simple getter because it re-parses the hostname to verify. |
| - // This currently identifies only IPv4 addresses (bug 822685). |
| bool HostIsIPAddress() const; |
| // Getters for various components of the URL. The returned string will be |
| @@ -310,7 +323,7 @@ class URL_EXPORT GURL { |
| // values defined in Parsed for ExtractPort. |
| int IntPort() const; |
| - // Returns the port number of the url, or the default port number. |
| + // Returns the port number of the URL, or the default port number. |
| // If the scheme has no concept of port (or unknown default) returns |
| // PORT_UNSPECIFIED. |
| int EffectiveIntPort() const; |