diff options
| author | joaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-27 15:37:47 +0000 |
|---|---|---|
| committer | joaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-27 15:37:47 +0000 |
| commit | 6d73c6c2aacc57490f404e2df395396c785e9c35 (patch) | |
| tree | 66d8a72ef271d528553343aa5761b776270c53c8 /components | |
| parent | aa1d231d1be693c60301341b1ac5a4d7957d541e (diff) | |
| download | chromium_src-6d73c6c2aacc57490f404e2df395396c785e9c35.zip chromium_src-6d73c6c2aacc57490f404e2df395396c785e9c35.tar.gz chromium_src-6d73c6c2aacc57490f404e2df395396c785e9c35.tar.bz2 | |
Fix the URLBlacklistManager on iOS.
URLRequests never have net::LOAD_MAIN_FRAME nor net::LOAD_SUB_FRAME set on that
platform, so the blacklist must filter all URLRequests that it sees for now.
BUG=338283
R=dconnelly@chromium.org
Review URL: https://codereview.chromium.org/148253002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247240 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'components')
| -rw-r--r-- | components/policy/core/browser/url_blacklist_manager.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/components/policy/core/browser/url_blacklist_manager.cc b/components/policy/core/browser/url_blacklist_manager.cc index 5aa98cf..83df4f3 100644 --- a/components/policy/core/browser/url_blacklist_manager.cc +++ b/components/policy/core/browser/url_blacklist_manager.cc @@ -361,9 +361,12 @@ bool URLBlacklistManager::IsURLBlocked(const GURL& url) const { bool URLBlacklistManager::IsRequestBlocked( const net::URLRequest& request) const { DCHECK(io_task_runner_->RunsTasksOnCurrentThread()); +#if !defined(OS_IOS) + // TODO(joaodasilva): iOS doesn't set these flags. http://crbug.com/338283 int filter_flags = net::LOAD_MAIN_FRAME | net::LOAD_SUB_FRAME; if ((request.load_flags() & filter_flags) == 0) return false; +#endif if (skip_blacklist_(request.url())) return false; |