Commit 84a0160e authored by yilkal's avatar yilkal Committed by Commit Bot

Don't filter iframes for manually allowed URLs.

This cl updates IsMainFrameWhitelisted to include domains which the
parents have manually whitelisted. This can happen when a child asks
for permission and the parent manually approves it.

Bug: 850328
Change-Id: I056ccf9f5bc1385013eb0f41cf0014c2c859a45b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1837409
Commit-Queue: Yilkal Abe <yilkal@chromium.org>
Reviewed-by: default avatarMichael Giuffrida <michaelpg@chromium.org>
Cr-Commit-Position: refs/heads/master@{#704431}
parent ba679c29
...@@ -126,8 +126,10 @@ bool IsMainFrameWhitelisted(content::WebContents* web_contents) { ...@@ -126,8 +126,10 @@ bool IsMainFrameWhitelisted(content::WebContents* web_contents) {
behavior == SupervisedUserURLFilter::FilteringBehavior::ALLOW; behavior == SupervisedUserURLFilter::FilteringBehavior::ALLOW;
bool is_whitelisted = bool is_whitelisted =
reason == supervised_user_error_page::FilteringBehaviorReason::WHITELIST; reason == supervised_user_error_page::FilteringBehaviorReason::WHITELIST;
bool is_manual =
reason == supervised_user_error_page::FilteringBehaviorReason::MANUAL;
return is_allowed && is_whitelisted; return is_allowed && (is_whitelisted || is_manual);
} }
} // namespace } // namespace
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment