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

Side by Side Diff: build/common.gypi

Issue 10783006: Removing ENABLE_PROMO_RESOURCE_SERVICE guards (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: TODO to remove kNtpCustomLogo Created 8 years, 5 months 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
« no previous file with comments | « no previous file | chrome/browser/profiles/profile_impl.h » ('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 270 matching lines...) Expand 10 before | Expand all | Expand 10 after
281 # Enables theme support, which is enabled by default. Support for 281 # Enables theme support, which is enabled by default. Support for
282 # disabling depends on the platform. 282 # disabling depends on the platform.
283 'enable_themes%': 1, 283 'enable_themes%': 1,
284 284
285 # Enables support for background apps. 285 # Enables support for background apps.
286 'enable_background%': 1, 286 'enable_background%': 1,
287 287
288 # Enable the task manager by default. 288 # Enable the task manager by default.
289 'enable_task_manager%': 1, 289 'enable_task_manager%': 1,
290 290
291 # Enables support for promo resource service.
292 'enable_promo_resource_service%': 1,
293
294 # XInput2 multitouch support is disabled by default (use_xi2_mt=0). 291 # XInput2 multitouch support is disabled by default (use_xi2_mt=0).
295 # Setting to non-zero value enables XI2 MT. When XI2 MT is enabled, 292 # Setting to non-zero value enables XI2 MT. When XI2 MT is enabled,
296 # the input value also defines the required XI2 minor minimum version. 293 # the input value also defines the required XI2 minor minimum version.
297 # For example, use_xi2_mt=2 means XI2.2 or above version is required. 294 # For example, use_xi2_mt=2 means XI2.2 or above version is required.
298 'use_xi2_mt%': 0, 295 'use_xi2_mt%': 0,
299 296
300 # Use of precompiled headers on Windows. 297 # Use of precompiled headers on Windows.
301 # 298 #
302 # This is on by default in VS 2010, but off by default for VS 299 # This is on by default in VS 2010, but off by default for VS
303 # 2008 because of complications that it can cause with our 300 # 2008 because of complications that it can cause with our
(...skipping 267 matching lines...) Expand 10 before | Expand all | Expand 10 after
571 'enable_extensions%': '<(enable_extensions)', 568 'enable_extensions%': '<(enable_extensions)',
572 'enable_web_intents%': '<(enable_web_intents)', 569 'enable_web_intents%': '<(enable_web_intents)',
573 'enable_web_intents_tag%': '<(enable_web_intents_tag)', 570 'enable_web_intents_tag%': '<(enable_web_intents_tag)',
574 'ios_sdk%': '<(ios_sdk)', 571 'ios_sdk%': '<(ios_sdk)',
575 'ios_deployment_target%': '<(ios_deployment_target)', 572 'ios_deployment_target%': '<(ios_deployment_target)',
576 'enable_plugin_installation%': '<(enable_plugin_installation)', 573 'enable_plugin_installation%': '<(enable_plugin_installation)',
577 'enable_protector_service%': '<(enable_protector_service)', 574 'enable_protector_service%': '<(enable_protector_service)',
578 'enable_session_service%': '<(enable_session_service)', 575 'enable_session_service%': '<(enable_session_service)',
579 'enable_themes%': '<(enable_themes)', 576 'enable_themes%': '<(enable_themes)',
580 'enable_background%': '<(enable_background)', 577 'enable_background%': '<(enable_background)',
581 'enable_promo_resource_service%': '<(enable_promo_resource_service)',
582 'linux_use_gold_binary%': '<(linux_use_gold_binary)', 578 'linux_use_gold_binary%': '<(linux_use_gold_binary)',
583 'linux_use_gold_flags%': '<(linux_use_gold_flags)', 579 'linux_use_gold_flags%': '<(linux_use_gold_flags)',
584 'use_canvas_skia%': '<(use_canvas_skia)', 580 'use_canvas_skia%': '<(use_canvas_skia)',
585 'test_isolation_mode%': '<(test_isolation_mode)', 581 'test_isolation_mode%': '<(test_isolation_mode)',
586 'test_isolation_outdir%': '<(test_isolation_outdir)', 582 'test_isolation_outdir%': '<(test_isolation_outdir)',
587 'enable_automation%': '<(enable_automation)', 583 'enable_automation%': '<(enable_automation)',
588 'enable_printing%': '<(enable_printing)', 584 'enable_printing%': '<(enable_printing)',
589 'enable_captive_portal_detection%': '<(enable_captive_portal_detection)', 585 'enable_captive_portal_detection%': '<(enable_captive_portal_detection)',
590 'force_rlz_use_chrome_net%': '<(force_rlz_use_chrome_net)', 586 'force_rlz_use_chrome_net%': '<(force_rlz_use_chrome_net)',
591 'enable_task_manager%': '<(enable_task_manager)', 587 'enable_task_manager%': '<(enable_task_manager)',
(...skipping 328 matching lines...) Expand 10 before | Expand all | Expand 10 after
920 'enable_automation%': 0, 916 'enable_automation%': 0,
921 'enable_printing%': 0, 917 'enable_printing%': 0,
922 'java_bridge%': 1, 918 'java_bridge%': 1,
923 919
924 # Android does not support themes. 920 # Android does not support themes.
925 'enable_themes%': 0, 921 'enable_themes%': 0,
926 922
927 # Android does not support background apps. 923 # Android does not support background apps.
928 'enable_background%': 0, 924 'enable_background%': 0,
929 925
930 # Always shows promotions.
931 'enable_promo_resource_service%': 1,
932
933 # Sessions are store separately in the Java side. 926 # Sessions are store separately in the Java side.
934 'enable_session_service%': 0, 927 'enable_session_service%': 0,
935 928
936 # Set to 1 once we have a notification system for Android. 929 # Set to 1 once we have a notification system for Android.
937 # http://crbug.com/115320 930 # http://crbug.com/115320
938 'notifications%': 0, 931 'notifications%': 0,
939 932
940 'gtest_target_type%': '<(gtest_target_type)', 933 'gtest_target_type%': '<(gtest_target_type)',
941 # TODO(jrg): when 'gtest_target_type'=='shared_library' and 934 # TODO(jrg): when 'gtest_target_type'=='shared_library' and
942 # OS==android, make all gtest_targets depend on 935 # OS==android, make all gtest_targets depend on
(...skipping 596 matching lines...) Expand 10 before | Expand all | Expand 10 after
1539 }], 1532 }],
1540 ['enable_session_service==1', { 1533 ['enable_session_service==1', {
1541 'defines': ['ENABLE_SESSION_SERVICE=1'], 1534 'defines': ['ENABLE_SESSION_SERVICE=1'],
1542 }], 1535 }],
1543 ['enable_themes==1', { 1536 ['enable_themes==1', {
1544 'defines': ['ENABLE_THEMES=1'], 1537 'defines': ['ENABLE_THEMES=1'],
1545 }], 1538 }],
1546 ['enable_background==1', { 1539 ['enable_background==1', {
1547 'defines': ['ENABLE_BACKGROUND=1'], 1540 'defines': ['ENABLE_BACKGROUND=1'],
1548 }], 1541 }],
1549 ['enable_promo_resource_service==1', {
1550 'defines': ['ENABLE_PROMO_RESOURCE_SERVICE=1'],
1551 }],
1552 ['enable_automation==1', { 1542 ['enable_automation==1', {
1553 'defines': ['ENABLE_AUTOMATION=1'], 1543 'defines': ['ENABLE_AUTOMATION=1'],
1554 }], 1544 }],
1555 ['enable_printing==1', { 1545 ['enable_printing==1', {
1556 'defines': ['ENABLE_PRINTING=1'], 1546 'defines': ['ENABLE_PRINTING=1'],
1557 }], 1547 }],
1558 ['enable_captive_portal_detection==1', { 1548 ['enable_captive_portal_detection==1', {
1559 'defines': ['ENABLE_CAPTIVE_PORTAL_DETECTION=1'], 1549 'defines': ['ENABLE_CAPTIVE_PORTAL_DETECTION=1'],
1560 }], 1550 }],
1561 ], # conditions for 'target_defaults' 1551 ], # conditions for 'target_defaults'
(...skipping 1728 matching lines...) Expand 10 before | Expand all | Expand 10 after
3290 # settings in target dicts. SYMROOT is a special case, because many other 3280 # settings in target dicts. SYMROOT is a special case, because many other
3291 # Xcode variables depend on it, including variables such as 3281 # Xcode variables depend on it, including variables such as
3292 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 3282 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
3293 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 3283 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
3294 # files to appear (when present) in the UI as actual files and not red 3284 # files to appear (when present) in the UI as actual files and not red
3295 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 3285 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
3296 # and therefore SYMROOT, needs to be set at the project level. 3286 # and therefore SYMROOT, needs to be set at the project level.
3297 'SYMROOT': '<(DEPTH)/xcodebuild', 3287 'SYMROOT': '<(DEPTH)/xcodebuild',
3298 }, 3288 },
3299 } 3289 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/profiles/profile_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698