Revert 284508 "GN chrome/common build, rename enable_printing."
> GN chrome/common build, rename enable_printing. > > This adds the missing conditions to the chrome/common GN build file (previously > only the basic files were there). Some refactoring of the GYP file to make this > possible. > > Renames the enable_printing flag to printing_mode since this is an integer > tri-state. > > Minor improvements to chrome/renderer > > R=jamesr@chromium.org > > Review URL: https://codereview.chromium.org/400243003 TBR=brettw@chromium.org Review URL: https://codereview.chromium.org/409543008 git-svn-id: http://src.chromium.org/svn/trunk/src/build@284517 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
This commit is contained in:
Родитель
c5dace6bbc
Коммит
1a24389d3f
|
@ -52,9 +52,9 @@ config("feature_flags") {
|
|||
if (enable_plugins) {
|
||||
defines += [ "ENABLE_PLUGINS=1" ]
|
||||
}
|
||||
if (printing_mode > 0) {
|
||||
if (enable_printing > 0) {
|
||||
defines += [ "ENABLE_PRINTING=1" ]
|
||||
if (printing_mode < 2) {
|
||||
if (enable_printing < 2) {
|
||||
defines += [ "ENABLE_FULL_PRINTING=1" ]
|
||||
}
|
||||
}
|
||||
|
|
|
@ -56,9 +56,9 @@ enable_pepper_cdms = enable_plugins && (is_linux || is_mac || is_win)
|
|||
# fully, and 2 enables only the codepath to generate a Metafile (e.g. usually
|
||||
# a PDF or EMF) and disables print preview, cloud print, UI, etc.
|
||||
if (is_android) {
|
||||
printing_mode = 2
|
||||
enable_printing = 2
|
||||
} else {
|
||||
printing_mode = 1
|
||||
enable_printing = 1
|
||||
}
|
||||
|
||||
# The seccomp-bpf sandbox is only supported on three architectures
|
||||
|
|
|
@ -121,9 +121,9 @@ if (enable_extensions) {
|
|||
if (enable_plugins) {
|
||||
grit_defines += [ "-D", "enable_plugins" ]
|
||||
}
|
||||
if (printing_mode != 0) {
|
||||
if (enable_printing != 0) {
|
||||
grit_defines += [ "-D", "enable_printing" ]
|
||||
if (printing_mode == 1) {
|
||||
if (enable_printing == 1) {
|
||||
grit_defines += [ "-D", "enable_full_printing" ]
|
||||
}
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче