From 09fa9366dd486c2f48f1c399352ca78f462d1d0f Mon Sep 17 00:00:00 2001 From: tmoniuszko Date: Tue, 5 May 2015 01:05:10 -0700 Subject: [PATCH] Allow safe_browsing_mode overriding in gn build BUG= Review URL: https://codereview.chromium.org/1122763003 Cr-Original-Commit-Position: refs/heads/master@{#328298} Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src Cr-Mirrored-Commit: c01623f93b4c741608cc607bfbf71c95a97a76e4 --- config/features.gni | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/config/features.gni b/config/features.gni index 661170ecd..290c1d6d8 100644 --- a/config/features.gni +++ b/config/features.gni @@ -85,6 +85,20 @@ declare_args() { # Enables browser side Content Decryption Modules. Required for embedders # (e.g. Android and ChromeCast) that use a browser side CDM. enable_browser_cdms = is_android + + # Variable safe_browsing is used to control the build time configuration for + # safe browsing feature. Safe browsing can be compiled in 3 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. + if (is_android) { + safe_browsing_mode = 2 + } else if (is_ios) { + safe_browsing_mode = 0 + } else { + safe_browsing_mode = 1 + } } # Additional dependent variables ----------------------------------------------- @@ -134,19 +148,6 @@ use_dbus = is_linux enable_extensions = !is_android && !is_ios -# Variable safe_browsing is used to control the build time configuration for -# safe browsing feature. Safe browsing can be compiled in 3 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. -if (is_android) { - safe_browsing_mode = 2 -} else if (is_ios) { - safe_browsing_mode = 0 -} else { - safe_browsing_mode = 1 -} - enable_task_manager = !is_ios && !is_android use_cups = is_desktop_linux || is_mac