summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorvadimt@chromium.org <vadimt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-07 22:44:40 +0000
committervadimt@chromium.org <vadimt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-07 22:44:40 +0000
commit6ee43a78f54a4a8b9562ee88bbcc4f9587a339bd (patch)
treef884daa6336c918453da14b51d87021c035829d9 /build
parentb761c6337d1c13708dac77c7a9586e7565cdcb1f (diff)
downloadchromium_src-6ee43a78f54a4a8b9562ee88bbcc4f9587a339bd.zip
chromium_src-6ee43a78f54a4a8b9562ee88bbcc4f9587a339bd.tar.gz
chromium_src-6ee43a78f54a4a8b9562ee88bbcc4f9587a339bd.tar.bz2
Creating a skeleton for Google Now for Chrome implementation.
The CL creates the top-level structure for showing Google Now cards in Chrome via Chrome Notifications. The implementation lives behind -enable-google-now-integration flag. BUG=164227 Review URL: https://chromiumcodereview.appspot.com/11412291 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@171868 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
-rw-r--r--build/common.gypi9
1 files changed, 9 insertions, 0 deletions
diff --git a/build/common.gypi b/build/common.gypi
index 31bf1c4..f24dadde 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -299,6 +299,9 @@
# Enable browser automation.
'enable_automation%': 1,
+ # Enable Google Now.
+ 'enable_google_now%': 1,
+
# Enable language detection.
'enable_language_detection%': 1,
@@ -480,6 +483,7 @@
['OS=="android"', {
'enable_extensions%': 0,
+ 'enable_google_now%': 0,
'enable_language_detection%': 0,
'enable_printing%': 0,
'enable_themes%': 0,
@@ -493,6 +497,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,
@@ -691,6 +696,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)',
@@ -1888,6 +1894,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'],
}],