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

Unified Diff: build/common.gypi

Issue 1110723002: Split to SafeBrowsingDatabaseManager into Local* and Remote*. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Respond to review. Tweak comments and list initializer. Created 5 years, 7 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 | « no previous file | build/config/BUILD.gn » ('j') | chrome/browser/profiles/profile_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index dc3be24971f03abb511ab2d268602524f52e5b5f..e4fc799cf74587eebcd12ce6662b4928eaa20307 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -371,11 +371,11 @@
'configuration_policy%': 1,
# Variable safe_browsing is used to control the build time configuration
- # for safe browsing feature. Safe browsing can be compiled in 3 different
+ # for safe browsing feature. Safe browsing can be compiled in 4 different
# levels: 0 disables it, 1 enables it fully, and 2 enables only UI and
- # reporting features without enabling phishing and malware detection. This
- # is useful to integrate a third party phishing/malware detection to
- # existing safe browsing logic.
+ # reporting features for use with Data Saver on Mobile, and 3 enables
+ # extended mobile protection via an external API. When 3 is fully
+ # deployed, it will replace 2.
'safe_browsing%': 1,
# Web speech is enabled by default. Set to 0 to disable.
@@ -3015,8 +3015,8 @@
# SAFE_BROWSING_DB_REMOTE - service talks via API to a database
# SAFE_BROWSING_CSD - enable client-side phishing detection.
['safe_browsing==1', {
- # TODO(nparker): Remove existing uses of FULL_SAFE_BROWSING
'defines': [
+ # TODO(nparker): Remove existing uses of FULL_SAFE_BROWSING
'FULL_SAFE_BROWSING',
'SAFE_BROWSING_CSD',
'SAFE_BROWSING_DB_LOCAL',
@@ -3030,6 +3030,14 @@
'SAFE_BROWSING_SERVICE',
],
}],
+ ['safe_browsing==3', {
+ 'defines': [
+ # TODO(nparker): Remove existing uses of MOBILE_SAFE_BROWSING
+ 'MOBILE_SAFE_BROWSING',
+ 'SAFE_BROWSING_DB_REMOTE',
+ 'SAFE_BROWSING_SERVICE',
+ ],
+ }],
], # conditions for 'target_defaults'
'target_conditions': [
['<(use_libpci)==1', {
« no previous file with comments | « no previous file | build/config/BUILD.gn » ('j') | chrome/browser/profiles/profile_impl.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698