Renamed DISABLE_BASIC_PRINTING and ENABLE_FULL_PRINTING.

build/common.gypi

Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 91156ec1e85f9cdcef702490946ac6bbf3b4b1b6..ae81d4c0916256d6cf2bceb1bf431b14eb5b71ab 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -488,11 +488,12 @@
       '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,
+      # which parts of printing will be built.
+      # 0 disables printing completely
+      # 1 enables basic printing
+      # 2 enables printing with print privew

[Lei Zhang, 2014/11/05 01:38:10]

typo

[Vitaly Buka (NO REVIEWS), 2014/11/05 01:54:30]

Done.

+      # 3 enables basic printing and print privew
+      'printing_mode%': 3,
 
       # Set the version of CLD.
       #   0: Don't specify the version. This option is for the Finch testing.
@@ -770,7 +771,7 @@
           'arm_neon_optional%': 1,
           'native_discardable_memory%': 1,
           'native_memory_pressure_signals%': 1,
-          'enable_printing%': 2,
+          'printing_mode%': 1,
           'enable_task_manager%':0,
           'video_hole%': 1,
         }],
@@ -809,7 +810,7 @@
           'enable_extensions%': 0,
           'enable_google_now%': 0,
           'cld_version%': 1,
-          'enable_printing%': 0,
+          'printing_mode%': 0,
           'enable_session_service%': 0,
           'enable_themes%': 0,
           'enable_webrtc%': 0,
@@ -979,7 +980,7 @@
         # Disable various features by default on embedded.
         ['embedded==1', {
           'remoting%': 0,
-          'enable_printing%': 0,
+          'printing_mode%': 0,
         }],
 
         # By default, use ICU data file (icudtl.dat) on all platforms
@@ -1175,7 +1176,7 @@
     '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)',
+    'printing_mode%': '<(printing_mode)',
     'enable_spellcheck%': '<(enable_spellcheck)',
     'enable_google_now%': '<(enable_google_now)',
     'cld_version%': '<(cld_version)',
@@ -2096,11 +2097,11 @@
       ['enable_plugins!=0', {
         'grit_defines': ['-D', 'enable_plugins'],
       }],
-      ['enable_printing!=0', {
+      ['printing_mode!=0', {
         'grit_defines': ['-D', 'enable_printing'],
       }],
-      ['enable_printing==1', {
-        'grit_defines': ['-D', 'enable_full_printing'],
+      ['printing_mode>1', {
+        'grit_defines': ['-D', 'enable_print_preview'],
       }],
       ['enable_themes==1', {
         'grit_defines': ['-D', 'enable_themes'],
@@ -2923,12 +2924,15 @@
         # chrome://translate-internals
         'defines': ['CLD2_DATA_SOURCE=<(cld2_data_source)'],
       }],
-      ['enable_printing==1', {
-        'defines': ['ENABLE_FULL_PRINTING=1', 'ENABLE_PRINTING=1'],
-      }],
-      ['enable_printing==2', {
+      ['printing_mode!=0', {
         'defines': ['ENABLE_PRINTING=1'],
       }],
+      ['printing_mode==1 or printing_mode==3', {
+        'defines': ['ENABLE_BASIC_PRINTING=1'],
+      }],
+      ['printing_mode>1', {
+        'defines': ['ENABLE_PRINT_PREVIEW=1'],
+      }],
       ['enable_spellcheck==1', {
         'defines': ['ENABLE_SPELLCHECK=1'],
       }],