Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3450)

Unified Diff: build/common.gypi

Issue 1458653002: New build flag system, convert Google Now flag (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index ca65fc31caa20734aa0cac0868a30544aa2dc8a7..90ebf072e5ddc5ed9bd92b6dda57f5c4c7977a20 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -538,9 +538,6 @@
# Enable Chrome browser extensions
'enable_extensions%': 1,
- # Enable Google Now.
- 'enable_google_now%': 1,
-
# Enable basic printing support and UI.
'enable_basic_printing%': 1,
@@ -803,7 +800,6 @@
['OS=="android"', {
'enable_extensions%': 0,
- 'enable_google_now%': 0,
'cld2_table_size%': 0,
'enable_themes%': 0,
'remoting%': 0,
@@ -850,7 +846,6 @@
['OS=="ios"', {
'disable_ftp_support%': 1,
'enable_extensions%': 0,
- 'enable_google_now%': 0,
'cld2_table_size%': 0,
'enable_basic_printing%': 0,
'enable_print_preview%': 0,
@@ -1203,7 +1198,6 @@
'enable_print_preview%': '<(enable_print_preview)',
'enable_spellcheck%': '<(enable_spellcheck)',
'use_browser_spellchecker%': '<(use_browser_spellchecker)',
- 'enable_google_now%': '<(enable_google_now)',
'cld_version%': '<(cld_version)',
'cld2_table_size%': '<(cld2_table_size)',
'enable_captive_portal_detection%': '<(enable_captive_portal_detection)',
@@ -2166,9 +2160,6 @@
['enable_settings_app==1', {
'grit_defines': ['-D', 'enable_settings_app'],
}],
- ['enable_google_now==1', {
- 'grit_defines': ['-D', 'enable_google_now'],
- }],
['use_concatenated_impulse_responses==1', {
'grit_defines': ['-D', 'use_concatenated_impulse_responses'],
}],
@@ -2978,9 +2969,6 @@
['enable_background==1', {
'defines': ['ENABLE_BACKGROUND=1'],
}],
- ['enable_google_now==1', {
- 'defines': ['ENABLE_GOOGLE_NOW=1'],
- }],
['enable_basic_printing==1 or enable_print_preview==1', {
# Convenience define for ENABLE_BASIC_PRINTING || ENABLE_PRINT_PREVIEW.
'defines': ['ENABLE_PRINTING=1'],

Powered by Google App Engine
This is Rietveld 408576698