Chromium Code Reviews| 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 6cde6d902f461593fe2df6835c86316d9c058b11..eb011b27454f2c613c871913ebd2699b2f448902 100644 |
| --- a/chrome/browser/safe_browsing/ui_manager.cc |
| +++ b/chrome/browser/safe_browsing/ui_manager.cc |
| @@ -92,7 +92,7 @@ void SafeBrowsingUIManager::CreateAndSendHitReport( |
| hit_report.is_metrics_reporting_active = |
| ChromeMetricsServiceAccessor::IsMetricsAndCrashReportingEnabled(); |
| - MaybeReportSafeBrowsingHit(hit_report); |
| + MaybeReportSafeBrowsingHit(hit_report, web_contents); |
| for (Observer& observer : observer_list_) |
| observer.OnSafeBrowsingHit(resource); |
| @@ -107,11 +107,13 @@ void SafeBrowsingUIManager::ShowBlockingPageForResource( |
| // or after the warning dialog for download urls, only for |
| // extended-reporting users. |
| void SafeBrowsingUIManager::MaybeReportSafeBrowsingHit( |
| - const HitReport& hit_report) { |
| + const HitReport& hit_report, |
| + WebContents* web_contents) { |
| DCHECK_CURRENTLY_ON(BrowserThread::UI); |
| - // Send report if user opted-in extended reporting. |
| - if (hit_report.extended_reporting_level != SBER_LEVEL_OFF) { |
| + // Send report if user opted-in to extended reporting and is not in |
| + // incognito mode. |
| + if (ShouldSendHitReport(hit_report, web_contents)) { |
| BrowserThread::PostTask( |
| BrowserThread::IO, FROM_HERE, |
| base::BindOnce(&SafeBrowsingUIManager::ReportSafeBrowsingHitOnIOThread, |
| @@ -119,6 +121,16 @@ void SafeBrowsingUIManager::MaybeReportSafeBrowsingHit( |
| } |
| } |
| +// Static |
| +bool SafeBrowsingUIManager::ShouldSendHitReport(const HitReport& hit_report, |
| + WebContents* web_contents) { |
| + if (hit_report.extended_reporting_level != SBER_LEVEL_OFF && |
| + web_contents->GetBrowserContext()->IsOffTheRecord() == false) { |
|
Jialiu Lin
2017/05/18 22:32:12
nit: replace "web_contents->GetBrowserContext()->I
mortonm
2017/05/19 20:21:03
Done.
|
| + return true; |
| + } |
| + return false; |
| +} |
| + |
| void SafeBrowsingUIManager::ReportSafeBrowsingHitOnIOThread( |
| const HitReport& hit_report) { |
| DCHECK_CURRENTLY_ON(BrowserThread::IO); |