chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc - Issue 397853002: 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 397853002: Refactor safe-browsing build-config definitions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase to pick up safe_browsing_resource_throttle_factory change. Created 6 years, 5 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

« build/common.gypi ('K') | « chrome/browser/profiles/profile_impl_io_data.cc ('k') | chrome/browser/renderer_host/safe_browsing_resource_throttle_factory.h » ('j') | chrome/browser/renderer_host/safe_browsing_resource_throttle_factory.cc » ('J')
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 4a9f0a8dd60686c7c5bc5aa7075f162103cee5dc..23dacfd5f50d4c6e1a775606049768f5ed22facc 100644

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

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

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

ResourceType::Type 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()