From 003e686c9c87261c83375a4ba668d58a212d2f61 Mon Sep 17 00:00:00 2001
From: vitalybuka <vitalybuka@chromium.org>
Date: Wed, 5 Nov 2014 13:15:12 -0800
Subject: [PATCH] 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
---
 common.gypi                        | 10 +++++-----
 config/BUILD.gn                    |  4 ++--
 secondary/tools/grit/grit_rule.gni |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/common.gypi b/common.gypi
index 1c19ffa3a..dfff46b9d 100644
--- a/common.gypi
+++ b/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'],
diff --git a/config/BUILD.gn b/config/BUILD.gn
index 7fbbd5d70..3f3506b7b 100644
--- a/config/BUILD.gn
+++ b/config/BUILD.gn
@@ -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) {
diff --git a/secondary/tools/grit/grit_rule.gni b/secondary/tools/grit/grit_rule.gni
index 572b11f22..1d9ded291 100644
--- a/secondary/tools/grit/grit_rule.gni
+++ b/secondary/tools/grit/grit_rule.gni
@@ -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) {