Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1904)

Unified Diff: chrome/browser/intranet_redirect_detector.cc

Issue 13979002: Add support for split PSL list distinctions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed chrome_frame compilation issue Created 7 years, 8 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:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/intranet_redirect_detector.cc
diff --git a/chrome/browser/intranet_redirect_detector.cc b/chrome/browser/intranet_redirect_detector.cc
index 308a14ae6ea365834d51b83a56e0cc88257accca..53b1eed13a3d5fb16cabfbdeecabec5dc0a6f02c 100644
--- a/chrome/browser/intranet_redirect_detector.cc
+++ b/chrome/browser/intranet_redirect_detector.cc
@@ -121,7 +121,9 @@ void IntranetRedirectDetector::OnURLFetchComplete(
return;
}
if (net::RegistryControlledDomainService::SameDomainOrHost(
- resulting_origins_.front(), origin)) {
+ resulting_origins_.front(),
+ origin,
+ net::RCDS::EXCLUDE_PRIVATE_REGISTRIES)) {
redirect_origin_ = origin;
if (!fetchers_.empty()) {
// Cancel remaining fetch, we don't need it.
@@ -136,7 +138,9 @@ void IntranetRedirectDetector::OnURLFetchComplete(
}
DCHECK(resulting_origins_.size() == 2);
redirect_origin_ = net::RegistryControlledDomainService::SameDomainOrHost(
- resulting_origins_.back(), origin) ? origin : GURL();
+ resulting_origins_.back(),
+ origin,
+ net::RCDS::EXCLUDE_PRIVATE_REGISTRIES) ? origin : GURL();
}
g_browser_process->local_state()->SetString(

Powered by Google App Engine
This is Rietveld 408576698