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

Unified Diff: build/common.gypi

Issue 11412291: Creating a skeleton for Google Now for Chrome implementation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Final sky's comments. Created 8 years 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
« no previous file with comments | « no previous file | chrome/browser/chrome_browser_main.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index bdd49006875f580c53a7266484954d83982bdd67..1d1c138007ec4d4ab7c838f0a8e652e94c9344e6 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -302,6 +302,9 @@
# Enable browser automation.
'enable_automation%': 1,
+ # Enable Google Now.
+ 'enable_google_now%': 1,
+
# Enable language detection.
'enable_language_detection%': 1,
@@ -478,6 +481,7 @@
['OS=="android"', {
'enable_extensions%': 0,
+ 'enable_google_now%': 0,
'enable_language_detection%': 0,
'enable_printing%': 0,
'enable_themes%': 0,
@@ -491,6 +495,7 @@
'disable_ftp_support%': 1,
'enable_automation%': 0,
'enable_extensions%': 0,
+ 'enable_google_now%': 0,
'enable_language_detection%': 0,
'enable_printing%': 0,
'enable_session_service%': 0,
@@ -682,6 +687,7 @@
'test_isolation_outdir%': '<(test_isolation_outdir)',
'enable_automation%': '<(enable_automation)',
'enable_printing%': '<(enable_printing)',
+ 'enable_google_now%': '<(enable_google_now)',
'enable_language_detection%': '<(enable_language_detection)',
'enable_captive_portal_detection%': '<(enable_captive_portal_detection)',
'disable_ftp_support%': '<(disable_ftp_support)',
@@ -1863,6 +1869,9 @@
['enable_automation==1', {
'defines': ['ENABLE_AUTOMATION=1'],
}],
+ ['enable_google_now==1', {
+ 'defines': ['ENABLE_GOOGLE_NOW=1'],
+ }],
['enable_language_detection==1', {
'defines': ['ENABLE_LANGUAGE_DETECTION=1'],
}],
« no previous file with comments | « no previous file | chrome/browser/chrome_browser_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698