diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-08-14 11:38:45 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-08-14 17:16:47 +0000 |
| commit | 3a97ca8dd9b96b599ae2d33e40df0dd2f7ea5859 (patch) | |
| tree | 43cc572ba067417c7341db81f71ae7cc6e0fcc3e /chromium/net/base/registry_controlled_domains | |
| parent | f61ab1ac7f855cd281809255c0aedbb1895e1823 (diff) | |
| download | qtwebengine-chromium-3a97ca8dd9b96b599ae2d33e40df0dd2f7ea5859.tar.gz | |
BASELINE: Update chromium to 45.0.2454.40
Change-Id: Id2121d9f11a8fc633677236c65a3e41feef589e4
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
Diffstat (limited to 'chromium/net/base/registry_controlled_domains')
| -rw-r--r-- | chromium/net/base/registry_controlled_domains/registry_controlled_domain.cc | 2 | ||||
| -rw-r--r-- | chromium/net/base/registry_controlled_domains/registry_controlled_domain.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/chromium/net/base/registry_controlled_domains/registry_controlled_domain.cc b/chromium/net/base/registry_controlled_domains/registry_controlled_domain.cc index e5b8e4cb8a1..778e858a159 100644 --- a/chromium/net/base/registry_controlled_domains/registry_controlled_domain.cc +++ b/chromium/net/base/registry_controlled_domains/registry_controlled_domain.cc @@ -51,7 +51,7 @@ #include "net/base/net_module.h" #include "net/base/net_util.h" #include "url/gurl.h" -#include "url/url_parse.h" +#include "url/third_party/mozilla/url_parse.h" namespace net { namespace registry_controlled_domains { diff --git a/chromium/net/base/registry_controlled_domains/registry_controlled_domain.h b/chromium/net/base/registry_controlled_domains/registry_controlled_domain.h index 639f264047b..efca00fbde1 100644 --- a/chromium/net/base/registry_controlled_domains/registry_controlled_domain.h +++ b/chromium/net/base/registry_controlled_domains/registry_controlled_domain.h @@ -135,7 +135,7 @@ namespace registry_controlled_domains { // private additions in your lookup. // See this for example use cases: // https://wiki.mozilla.org/Public_Suffix_List/Use_Cases -enum NET_EXPORT PrivateRegistryFilter { +enum PrivateRegistryFilter { EXCLUDE_PRIVATE_REGISTRIES = 0, INCLUDE_PRIVATE_REGISTRIES }; @@ -148,7 +148,7 @@ enum NET_EXPORT PrivateRegistryFilter { // will be 0. If INCLUDE_UNKNOWN_REGISTRIES was passed in, the resulting // registry length will be the length of the last subcomponent (eg. 3 for // foobar.baz). -enum NET_EXPORT UnknownRegistryFilter { +enum UnknownRegistryFilter { EXCLUDE_UNKNOWN_REGISTRIES = 0, INCLUDE_UNKNOWN_REGISTRIES }; |