Renamed enable_printing and printing_mode in *.gyp* and .*gn* files.

build/common.gypi

Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index aadd060625ead1e57f4a2b51bb94cd1ef73068cb..3d319a6b03040a82c44da828c9e70f12d5611521 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -487,12 +487,11 @@
       # Enable Google Now.
       'enable_google_now%': 1,
 
-      # Enable printing support and UI. This variable is used to configure
-      # which parts of printing will be built. 0 disables printing completely,
-      # 1 enables it 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.
-      'enable_printing%': 1,
+      # Enable basic printing support and UI.
+      'enable_basic_printing%': 1,
+
+      # Enable printing with print preview.

[brettw, 2014/11/05 18:02:52]

Can you comment here "requires basic printing to be enabled".

[Vitaly Buka (NO REVIEWS), 2014/11/05 19:17:47]

It does not. The point is to have them independent.

[brettw, 2014/11/05 19:25:23]

Can you comment about that explicitly here then? Just reading this, I would have
expected preview to imply basic.

[Vitaly Buka (NO REVIEWS), 2014/11/05 21:50:03]

Done.

+      'enable_print_preview%': 1,
 
       # Set the version of CLD.
       #   0: Don't specify the version. This option is for the Finch testing.
@@ -770,7 +769,8 @@
           'arm_neon_optional%': 1,
           'native_discardable_memory%': 1,
           'native_memory_pressure_signals%': 1,
-          'enable_printing%': 2,
+          'enable_basic_printing%': 1,
+          'enable_print_preview%': 0,
           'enable_task_manager%':0,
           'video_hole%': 1,
         }],
@@ -809,7 +809,8 @@
           'enable_extensions%': 0,
           'enable_google_now%': 0,
           'cld_version%': 1,
-          'enable_printing%': 0,
+          'enable_basic_printing%': 0,
+          'enable_print_preview%': 0,
           'enable_session_service%': 0,
           'enable_themes%': 0,
           'enable_webrtc%': 0,
@@ -979,7 +980,8 @@
         # Disable various features by default on embedded.
         ['embedded==1', {
           'remoting%': 0,
-          'enable_printing%': 0,
+          'enable_basic_printing%': 0,
+          'enable_print_preview%': 0,
         }],
 
         # By default, use ICU data file (icudtl.dat) on all platforms
@@ -1175,7 +1177,8 @@
     'test_isolation_mode%': '<(test_isolation_mode)',
     'test_isolation_outdir%': '<(test_isolation_outdir)',
     'test_isolation_fail_on_missing': '<(test_isolation_fail_on_missing)',
-    'enable_printing%': '<(enable_printing)',
+    'enable_basic_printing%': '<(enable_basic_printing)',
+    'enable_print_preview%': '<(enable_print_preview)',
     'enable_spellcheck%': '<(enable_spellcheck)',
     'enable_google_now%': '<(enable_google_now)',
     'cld_version%': '<(cld_version)',
@@ -2096,10 +2099,10 @@
       ['enable_plugins!=0', {
         'grit_defines': ['-D', 'enable_plugins'],
       }],
-      ['enable_printing!=0', {
+      ['enable_basic_printing==1 or enable_print_preview==1', {
         'grit_defines': ['-D', 'enable_printing'],
       }],
-      ['enable_printing==1', {
+      ['enable_print_preview==1', {
         'grit_defines': ['-D', 'enable_print_preview'],
       }],
       ['enable_themes==1', {
@@ -2923,12 +2926,15 @@
         # chrome://translate-internals
         'defines': ['CLD2_DATA_SOURCE=<(cld2_data_source)'],
       }],
-      ['enable_printing!=0', {
-        'defines': ['ENABLE_PRINTING=1', 'ENABLE_BASIC_PRINTING=1'],
+      ['enable_basic_printing==1 or enable_print_preview==1', {
+        'defines': ['ENABLE_PRINTING=1'],

[brettw, 2014/11/05 19:25:23]

Can you also comment in common.gypi and in the GN file where these defines are
set what exactly they mean, being sure to mention that print preview doesn't
imply basic printing.

You can do this in either of these two patches, whichever is more convenient. 

[Vitaly Buka (NO REVIEWS), 2014/11/05 21:50:03]

Done.

       }],
-      ['enable_printing==1', {
+      ['enable_print_preview==1', {
         'defines': ['ENABLE_PRINT_PREVIEW=1'],
       }],
+      ['enable_basic_printing==1', {
+        'defines': ['ENABLE_BASIC_PRINTING=1'],
+      }],
       ['enable_spellcheck==1', {
         'defines': ['ENABLE_SPELLCHECK=1'],
       }],