Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(243)

Side by Side Diff: chrome/browser/renderer_host/safe_browsing_resource_throttle.cc

Issue 2272323002: Allow Safe Browsing Saresource Filter to distinguish between different lists. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix safe_browsing_service_browsertest Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/renderer_host/safe_browsing_resource_throttle.h" 5 #include "chrome/browser/renderer_host/safe_browsing_resource_throttle.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/metrics/histogram_macros.h" 10 #include "base/metrics/histogram_macros.h"
(...skipping 269 matching lines...) Expand 10 before | Expand all | Expand 10 after
280 content::WebContents* web_contents = resource.web_contents_getter.Run(); 280 content::WebContents* web_contents = resource.web_contents_getter.Run();
281 if (web_contents) { 281 if (web_contents) {
282 prerender::PrerenderContents* prerender_contents = 282 prerender::PrerenderContents* prerender_contents =
283 prerender::PrerenderContents::FromWebContents(web_contents); 283 prerender::PrerenderContents::FromWebContents(web_contents);
284 284
285 subresource_filter::ContentSubresourceFilterDriverFactory* driver_factory = 285 subresource_filter::ContentSubresourceFilterDriverFactory* driver_factory =
286 subresource_filter::ContentSubresourceFilterDriverFactory:: 286 subresource_filter::ContentSubresourceFilterDriverFactory::
287 FromWebContents(web_contents); 287 FromWebContents(web_contents);
288 DCHECK(driver_factory); 288 DCHECK(driver_factory);
289 driver_factory->OnMainResourceMatchedSafeBrowsingBlacklist( 289 driver_factory->OnMainResourceMatchedSafeBrowsingBlacklist(
290 resource.url, resource.redirect_urls, 290 resource.url, resource.redirect_urls, resource.threat_type,
291 resource.threat_metadata.threat_pattern_type); 291 resource.threat_metadata.threat_pattern_type);
292 292
293 if (prerender_contents) { 293 if (prerender_contents) {
294 prerender_contents->Destroy(prerender::FINAL_STATUS_SAFE_BROWSING); 294 prerender_contents->Destroy(prerender::FINAL_STATUS_SAFE_BROWSING);
295 } else { 295 } else {
296 ui_manager->DisplayBlockingPage(resource); 296 ui_manager->DisplayBlockingPage(resource);
297 return; 297 return;
298 } 298 }
299 } 299 }
300 300
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
388 unchecked_redirect_url_, "defer_reason", 388 unchecked_redirect_url_, "defer_reason",
389 "resumed_redirect"); 389 "resumed_redirect");
390 } 390 }
391 } 391 }
392 392
393 if (resume) { 393 if (resume) {
394 defer_state_ = DEFERRED_NONE; 394 defer_state_ = DEFERRED_NONE;
395 controller()->Resume(); 395 controller()->Resume();
396 } 396 }
397 } 397 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698