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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/chrome_browser_main.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 # IMPORTANT: 5 # IMPORTANT:
6 # Please don't directly include this file if you are building via gyp_chromium, 6 # Please don't directly include this file if you are building via gyp_chromium,
7 # since gyp_chromium is automatically forcing its inclusion. 7 # since gyp_chromium is automatically forcing its inclusion.
8 { 8 {
9 # Variables expected to be overriden on the GYP command line (-D) or by 9 # Variables expected to be overriden on the GYP command line (-D) or by
10 # ~/.gyp/include.gypi. 10 # ~/.gyp/include.gypi.
(...skipping 284 matching lines...) Expand 10 before | Expand all | Expand 10 after
295 295
296 # Enable Web Intents support in WebKit. 296 # Enable Web Intents support in WebKit.
297 'enable_web_intents%': 1, 297 'enable_web_intents%': 1,
298 298
299 # Enable Chrome browser extensions 299 # Enable Chrome browser extensions
300 'enable_extensions%': 1, 300 'enable_extensions%': 1,
301 301
302 # Enable browser automation. 302 # Enable browser automation.
303 'enable_automation%': 1, 303 'enable_automation%': 1,
304 304
305 # Enable Google Now.
306 'enable_google_now%': 1,
307
305 # Enable language detection. 308 # Enable language detection.
306 'enable_language_detection%': 1, 309 'enable_language_detection%': 1,
307 310
308 # Enable printing support and UI. 311 # Enable printing support and UI.
309 'enable_printing%': 1, 312 'enable_printing%': 1,
310 313
311 # Enable Web Intents web content registration via HTML element 314 # Enable Web Intents web content registration via HTML element
312 # and WebUI managing such registrations. 315 # and WebUI managing such registrations.
313 'enable_web_intents_tag%': 0, 316 'enable_web_intents_tag%': 0,
314 317
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
471 }, { 474 }, {
472 'file_manager_extension%': 0, 475 'file_manager_extension%': 0,
473 }], 476 }],
474 477
475 ['OS=="win" or OS=="mac" or (OS=="linux" and use_aura==0)', { 478 ['OS=="win" or OS=="mac" or (OS=="linux" and use_aura==0)', {
476 'enable_one_click_signin%': 1, 479 'enable_one_click_signin%': 1,
477 }], 480 }],
478 481
479 ['OS=="android"', { 482 ['OS=="android"', {
480 'enable_extensions%': 0, 483 'enable_extensions%': 0,
484 'enable_google_now%': 0,
481 'enable_language_detection%': 0, 485 'enable_language_detection%': 0,
482 'enable_printing%': 0, 486 'enable_printing%': 0,
483 'enable_themes%': 0, 487 'enable_themes%': 0,
484 'enable_webrtc%': 0, 488 'enable_webrtc%': 0,
485 'proprietary_codecs%': 1, 489 'proprietary_codecs%': 1,
486 'remoting%': 0, 490 'remoting%': 0,
487 }], 491 }],
488 492
489 ['OS=="ios"', { 493 ['OS=="ios"', {
490 'configuration_policy%': 0, 494 'configuration_policy%': 0,
491 'disable_ftp_support%': 1, 495 'disable_ftp_support%': 1,
492 'enable_automation%': 0, 496 'enable_automation%': 0,
493 'enable_extensions%': 0, 497 'enable_extensions%': 0,
498 'enable_google_now%': 0,
494 'enable_language_detection%': 0, 499 'enable_language_detection%': 0,
495 'enable_printing%': 0, 500 'enable_printing%': 0,
496 'enable_session_service%': 0, 501 'enable_session_service%': 0,
497 'enable_themes%': 0, 502 'enable_themes%': 0,
498 'enable_webrtc%': 0, 503 'enable_webrtc%': 0,
499 'notifications%': 0, 504 'notifications%': 0,
500 'remoting%': 0, 505 'remoting%': 0,
501 'safe_browsing%': 0, 506 'safe_browsing%': 0,
502 }], 507 }],
503 508
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
675 'enable_themes%': '<(enable_themes)', 680 'enable_themes%': '<(enable_themes)',
676 'use_oem_wallpaper%': '<(use_oem_wallpaper)', 681 'use_oem_wallpaper%': '<(use_oem_wallpaper)',
677 'enable_background%': '<(enable_background)', 682 'enable_background%': '<(enable_background)',
678 'linux_use_gold_binary%': '<(linux_use_gold_binary)', 683 'linux_use_gold_binary%': '<(linux_use_gold_binary)',
679 'linux_use_gold_flags%': '<(linux_use_gold_flags)', 684 'linux_use_gold_flags%': '<(linux_use_gold_flags)',
680 'use_canvas_skia%': '<(use_canvas_skia)', 685 'use_canvas_skia%': '<(use_canvas_skia)',
681 'test_isolation_mode%': '<(test_isolation_mode)', 686 'test_isolation_mode%': '<(test_isolation_mode)',
682 'test_isolation_outdir%': '<(test_isolation_outdir)', 687 'test_isolation_outdir%': '<(test_isolation_outdir)',
683 'enable_automation%': '<(enable_automation)', 688 'enable_automation%': '<(enable_automation)',
684 'enable_printing%': '<(enable_printing)', 689 'enable_printing%': '<(enable_printing)',
690 'enable_google_now%': '<(enable_google_now)',
685 'enable_language_detection%': '<(enable_language_detection)', 691 'enable_language_detection%': '<(enable_language_detection)',
686 'enable_captive_portal_detection%': '<(enable_captive_portal_detection)', 692 'enable_captive_portal_detection%': '<(enable_captive_portal_detection)',
687 'disable_ftp_support%': '<(disable_ftp_support)', 693 'disable_ftp_support%': '<(disable_ftp_support)',
688 'enable_task_manager%': '<(enable_task_manager)', 694 'enable_task_manager%': '<(enable_task_manager)',
689 'sas_dll_path%': '<(sas_dll_path)', 695 'sas_dll_path%': '<(sas_dll_path)',
690 'wix_path%': '<(wix_path)', 696 'wix_path%': '<(wix_path)',
691 'android_upstream_bringup%': '<(android_upstream_bringup)', 697 'android_upstream_bringup%': '<(android_upstream_bringup)',
692 'use_libjpeg_turbo%': '<(use_libjpeg_turbo)', 698 'use_libjpeg_turbo%': '<(use_libjpeg_turbo)',
693 'use_system_libjpeg%': '<(use_system_libjpeg)', 699 'use_system_libjpeg%': '<(use_system_libjpeg)',
694 'android_build_type%': '<(android_build_type)', 700 'android_build_type%': '<(android_build_type)',
(...skipping 1161 matching lines...) Expand 10 before | Expand all | Expand 10 after
1856 }], 1862 }],
1857 ['enable_themes==1', { 1863 ['enable_themes==1', {
1858 'defines': ['ENABLE_THEMES=1'], 1864 'defines': ['ENABLE_THEMES=1'],
1859 }], 1865 }],
1860 ['enable_background==1', { 1866 ['enable_background==1', {
1861 'defines': ['ENABLE_BACKGROUND=1'], 1867 'defines': ['ENABLE_BACKGROUND=1'],
1862 }], 1868 }],
1863 ['enable_automation==1', { 1869 ['enable_automation==1', {
1864 'defines': ['ENABLE_AUTOMATION=1'], 1870 'defines': ['ENABLE_AUTOMATION=1'],
1865 }], 1871 }],
1872 ['enable_google_now==1', {
1873 'defines': ['ENABLE_GOOGLE_NOW=1'],
1874 }],
1866 ['enable_language_detection==1', { 1875 ['enable_language_detection==1', {
1867 'defines': ['ENABLE_LANGUAGE_DETECTION=1'], 1876 'defines': ['ENABLE_LANGUAGE_DETECTION=1'],
1868 }], 1877 }],
1869 ['enable_printing==1', { 1878 ['enable_printing==1', {
1870 'defines': ['ENABLE_PRINTING=1'], 1879 'defines': ['ENABLE_PRINTING=1'],
1871 }], 1880 }],
1872 ['enable_captive_portal_detection==1', { 1881 ['enable_captive_portal_detection==1', {
1873 'defines': ['ENABLE_CAPTIVE_PORTAL_DETECTION=1'], 1882 'defines': ['ENABLE_CAPTIVE_PORTAL_DETECTION=1'],
1874 }], 1883 }],
1875 ['enable_app_list==1', { 1884 ['enable_app_list==1', {
(...skipping 1970 matching lines...) Expand 10 before | Expand all | Expand 10 after
3846 # settings in target dicts. SYMROOT is a special case, because many other 3855 # settings in target dicts. SYMROOT is a special case, because many other
3847 # Xcode variables depend on it, including variables such as 3856 # Xcode variables depend on it, including variables such as
3848 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 3857 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
3849 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 3858 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
3850 # files to appear (when present) in the UI as actual files and not red 3859 # files to appear (when present) in the UI as actual files and not red
3851 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 3860 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
3852 # and therefore SYMROOT, needs to be set at the project level. 3861 # and therefore SYMROOT, needs to be set at the project level.
3853 'SYMROOT': '<(DEPTH)/xcodebuild', 3862 'SYMROOT': '<(DEPTH)/xcodebuild',
3854 }, 3863 },
3855 } 3864 }
OLDNEW
« 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