Index: chrome/common/features.gni |
diff --git a/chrome/common/features.gni b/chrome/common/features.gni |
index 4af019cfaa449188dab399fdf7e2ecc71b2880c0..85bdbe559c943673344f85163938257d5d7d3e46 100644 |
--- a/chrome/common/features.gni |
+++ b/chrome/common/features.gni |
@@ -6,6 +6,7 @@ import("//build/config/chrome_build.gni") |
import("//build/config/chromecast_build.gni") |
import("//build/config/compiler/compiler.gni") |
import("//build/config/features.gni") |
+import("//printing/features/features.gni") |
# Please keep features in alphabetical order. |
declare_args() { |
@@ -67,12 +68,16 @@ declare_args() { |
use_vulcanize = true |
} |
+_enable_printing = enable_basic_printing || enable_print_preview |
Lei Zhang
2016/10/28 21:49:49
Does the leading underscore mean it's a local vari
brettw
2016/10/28 22:20:54
Yes, it won't get exposed to files that import thi
|
+ |
chrome_grit_defines = [ |
"enable_app_list=$enable_app_list", |
"enable_background=$enable_background", |
"enable_google_now=$enable_google_now", |
"enable_hangout_services_extension=$enable_hangout_services_extension", |
"enable_hotwording=$enable_hotwording", |
+ "enable_print_preview=$enable_print_preview", |
+ "enable_printing=$_enable_printing", |
"enable_service_discovery=$enable_service_discovery", |
"enable_vr_shell=$enable_vr_shell", |
"enable_webvr=$enable_webvr", |