diff options
author | nyquist@chromium.org <nyquist@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-14 20:49:29 +0000 |
---|---|---|
committer | nyquist@chromium.org <nyquist@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-14 20:49:29 +0000 |
commit | ed32c214924922c8729ac5d40782bb0b6687d6d0 (patch) | |
tree | 2194c4bdc380a423fcf8c9fefeeea1c79a723843 /chrome_frame/ready_mode | |
parent | b0e9dbad146da85a98b6fe1240b2aa5ce6d51daf (diff) | |
download | chromium_src-ed32c214924922c8729ac5d40782bb0b6687d6d0.zip chromium_src-ed32c214924922c8729ac5d40782bb0b6687d6d0.tar.gz chromium_src-ed32c214924922c8729ac5d40782bb0b6687d6d0.tar.bz2 |
Add support for split Public Suffix List distinctions.
This adds support for the private additions to the Public Suffix List.
* Since net::RegistryControlledDomainService only contained static methods, this
CL changes these methods to be contained within the namespace
net::registry_controlled_domains and removes the class entirely.
* All methods defined as part of net::registry_controlled_domains now
have a mandatory argument to specify whether the private registries
should be included.
* Since the old implementation did not take into account the private
registries, this sets all old callers to use EXCLUDE_PRIVATE as the
net::registry_controlled_domains::PrivateRegistryFilter argument.
* Changes the parameter for including unknown registries or not to be an enum
instead of a boolean, using a similar naming scheme as for the private
registries: net::registry_controlled_domains::UnknownRegistryFilter.
* This also updates the effective-TLD data file to:
45cfff9c781f 2013-04-23 11:51 +0100
It includes changes from a number of Mozilla bugs, listed on
https://hg.mozilla.org/mozilla-central/log/45cfff9c781f/netwerk/dns/effective_tld_names.dat
between 290afd57d2a8 (2012-07-04 16:08 +0100) and
45cfff9c781f (2013-04-23 11:51 +0100).
Patch set 1 is equal to the committed patch set from:
https://codereview.chromium.org/13979002/
TBRing OWNERs from original CL.
TBR=pam@chromium.org
BUG=37436, 96086
Review URL: https://codereview.chromium.org/15140003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@200066 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/ready_mode')
-rw-r--r-- | chrome_frame/ready_mode/ready_mode.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome_frame/ready_mode/ready_mode.cc b/chrome_frame/ready_mode/ready_mode.cc index 7e6a0df..1285329 100644 --- a/chrome_frame/ready_mode/ready_mode.cc +++ b/chrome_frame/ready_mode/ready_mode.cc @@ -159,8 +159,10 @@ BrowserObserver::BrowserObserver(ready_mode::Delegate* chrome_frame, } void BrowserObserver::OnNavigateTo(const std::wstring& url) { - if (!net::RegistryControlledDomainService:: - SameDomainOrHost(GURL(url), rendered_url_)) { + if (!net::registry_controlled_domains::SameDomainOrHost( + GURL(url), + rendered_url_, + net::registry_controlled_domains::EXCLUDE_PRIVATE_REGISTRIES)) { rendered_url_ = GURL(); Hide(); } |