Index: chrome/browser/google/google_util.h |
diff --git a/chrome/browser/google/google_util.h b/chrome/browser/google/google_util.h |
index 95ae4b9b933c7fe28d1bcf3fee3aa245f61d2464..d44afdca9aaa50eb8ace26aad56ebffcf5fbc05b 100644 |
--- a/chrome/browser/google/google_util.h |
+++ b/chrome/browser/google/google_util.h |
@@ -46,8 +46,20 @@ bool GetReactivationBrand(std::string* brand); |
// need to restrict some behavior to only happen on Google's officially-owned |
// domains, use TransportSecurityState::IsGooglePinnedProperty() instead. |
-// True if |host| is "[www.]google.<TLD>" with a valid TLD. |
-bool IsGoogleHostname(const std::string& host); |
+// Designate whether or not a URL checking function also checks for specific |
+// subdomains, or only "www" and empty subdomains. |
+enum SubdomainPermission { |
+ ALLOW_SUBDOMAIN, |
+ DISALLOW_SUBDOMAIN, |
+}; |
+ |
+// True if |url| is an HTTP[S] request with host "[www.]google.<TLD>" and no |
+// explicit port. If |allow_subdomain| is true, we check against host |
MAD
2012/04/17 18:16:28
Maybe fix this comment to the new param type not b
SteveT
2012/04/17 18:20:46
Done.
|
+// "*.google.<TLD>" instead. |
+bool IsGoogleDomainUrl(const std::string& url, SubdomainPermission permission); |
+// True if |host| is "[www.]google.<TLD>" with a valid TLD. If |
+// |allow_subdomain| is true, we check against host "*.google.<TLD>" instead. |
MAD
2012/04/17 18:16:28
Same here...
SteveT
2012/04/17 18:20:46
Done.
|
+bool IsGoogleHostname(const std::string& host, SubdomainPermission permission); |
// True if |url| represents a valid Google home page URL. |
bool IsGoogleHomePageUrl(const std::string& url); |
// True if |url| represents a valid Google search URL. |