chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc - Issue 1081403002: Refactor safe-browsing build-config definitions

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc

Issue 1081403002: Refactor safe-browsing build-config definitions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase again to fix collision Created 5 years, 8 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/profiles/profile_impl_io_data.cc ('k') | chrome/browser/renderer_host/safe_browsing_resource_throttle_factory.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc

diff --git a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc

index 14b99bb0b04a499c12fa4b9c7013c9aca2691c1d..3e494c810446de7b30d6e58c4edab2aed9d523a3 100644

--- a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc

+++ b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc

@@ -541,7 +541,7 @@ void ChromeResourceDispatcherHostDelegate::AppendStandardResourceThrottles(

ResourceType resource_type,

ScopedVector<content::ResourceThrottle>* throttles) {

ProfileIOData* io_data = ProfileIOData::FromResourceContext(resource_context);

-#if defined(FULL_SAFE_BROWSING) || defined(MOBILE_SAFE_BROWSING)

+#if defined(SAFE_BROWSING_SERVICE)

// Insert safe browsing at the front of the list, so it gets to decide on

// policies first.

if (io_data->safe_browsing_enabled()->GetValue()