| Index: chrome/browser/safe_browsing/ui_manager.cc
|
| diff --git a/chrome/browser/safe_browsing/ui_manager.cc b/chrome/browser/safe_browsing/ui_manager.cc
|
| index 72c7e04be5df6b7b1b2f3079bc430dd84a774da3..ecd1c4c917523a9a00a1c5fcf1419da1b66a2ab8 100644
|
| --- a/chrome/browser/safe_browsing/ui_manager.cc
|
| +++ b/chrome/browser/safe_browsing/ui_manager.cc
|
| @@ -74,6 +74,21 @@ SafeBrowsingUIManager::UnsafeResource::UnsafeResource()
|
|
|
| SafeBrowsingUIManager::UnsafeResource::~UnsafeResource() { }
|
|
|
| +bool SafeBrowsingUIManager::UnsafeResource::IsMainPageLoadBlocked() const {
|
| + // Subresource hits cannot happen until after main page load is committed.
|
| + if (is_subresource)
|
| + return false;
|
| +
|
| + // Client-side phishing detection interstitials never block the main frame
|
| + // load, since they happen after the page is finished loading.
|
| + if (threat_type == SB_THREAT_TYPE_CLIENT_SIDE_PHISHING_URL ||
|
| + threat_type == SB_THREAT_TYPE_CLIENT_SIDE_MALWARE_URL) {
|
| + return false;
|
| + }
|
| +
|
| + return true;
|
| +}
|
| +
|
| // SafeBrowsingUIManager -------------------------------------------------------
|
|
|
| SafeBrowsingUIManager::SafeBrowsingUIManager(
|
|
|