Re-factored printing defines and build configs.
Renamed DISABLE_BASIC_PRINTING to ENABLE_BASIC_PRINTING. Renamed ENABLE_FULL_PRINTING to ENABLE_PRINT_PREVIEW. BUG=430281 Review URL: https://codereview.chromium.org/702603004 Cr-Original-Commit-Position: refs/heads/master@{#302868} Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src Cr-Mirrored-Commit: e29991c62a63bbce344e597306dab8150c67b532
This commit is contained in:
Родитель
d89dcf43a1
Коммит
003e686c9c
10
common.gypi
10
common.gypi
|
@ -2100,7 +2100,7 @@
|
|||
'grit_defines': ['-D', 'enable_printing'],
|
||||
}],
|
||||
['enable_printing==1', {
|
||||
'grit_defines': ['-D', 'enable_full_printing'],
|
||||
'grit_defines': ['-D', 'enable_print_preview'],
|
||||
}],
|
||||
['enable_themes==1', {
|
||||
'grit_defines': ['-D', 'enable_themes'],
|
||||
|
@ -2923,11 +2923,11 @@
|
|||
# chrome://translate-internals
|
||||
'defines': ['CLD2_DATA_SOURCE=<(cld2_data_source)'],
|
||||
}],
|
||||
['enable_printing==1', {
|
||||
'defines': ['ENABLE_FULL_PRINTING=1', 'ENABLE_PRINTING=1'],
|
||||
['enable_printing!=0', {
|
||||
'defines': ['ENABLE_PRINTING=1', 'ENABLE_BASIC_PRINTING=1'],
|
||||
}],
|
||||
['enable_printing==2', {
|
||||
'defines': ['ENABLE_PRINTING=1'],
|
||||
['enable_printing==1', {
|
||||
'defines': ['ENABLE_PRINT_PREVIEW=1'],
|
||||
}],
|
||||
['enable_spellcheck==1', {
|
||||
'defines': ['ENABLE_SPELLCHECK=1'],
|
||||
|
|
|
@ -55,9 +55,9 @@ config("feature_flags") {
|
|||
defines += [ "ENABLE_PLUGINS=1" ]
|
||||
}
|
||||
if (printing_mode > 0) {
|
||||
defines += [ "ENABLE_PRINTING=1" ]
|
||||
defines += [ "ENABLE_PRINTING=1", "ENABLE_BASIC_PRINTING=1" ]
|
||||
if (printing_mode < 2) {
|
||||
defines += [ "ENABLE_FULL_PRINTING=1" ]
|
||||
defines += [ "ENABLE_PRINT_PREVIEW=1" ]
|
||||
}
|
||||
}
|
||||
if (enable_spellcheck) {
|
||||
|
|
|
@ -162,7 +162,7 @@ if (enable_plugins) {
|
|||
if (printing_mode != 0) {
|
||||
grit_defines += [ "-D", "enable_printing" ]
|
||||
if (printing_mode == 1) {
|
||||
grit_defines += [ "-D", "enable_full_printing" ]
|
||||
grit_defines += [ "-D", "enable_print_preview" ]
|
||||
}
|
||||
}
|
||||
if (enable_themes) {
|
||||
|
|
Загрузка…
Ссылка в новой задаче