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

Side by Side Diff: build/common.gypi

Issue 11064002: Adding support for alternate default wallpaper. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: added derat@ change to common.gypi Created 8 years, 2 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 | Annotate | Revision Log
« no previous file with comments | « ash/resources/ash_wallpaper_resources.grd ('k') | no next file » | 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 290 matching lines...) Expand 10 before | Expand all | Expand 10 after
301 'enable_pepper_threading%': 0, 301 'enable_pepper_threading%': 0,
302 302
303 # Enables use of the session service, which is enabled by default. 303 # Enables use of the session service, which is enabled by default.
304 # Support for disabling depends on the platform. 304 # Support for disabling depends on the platform.
305 'enable_session_service%': 1, 305 'enable_session_service%': 1,
306 306
307 # Enables theme support, which is enabled by default. Support for 307 # Enables theme support, which is enabled by default. Support for
308 # disabling depends on the platform. 308 # disabling depends on the platform.
309 'enable_themes%': 1, 309 'enable_themes%': 1,
310 310
311 # Uses OEM-specific wallpaper resources on Chrome OS.
312 'use_oem_wallpaper%': 0,
313
311 # Enables support for background apps. 314 # Enables support for background apps.
312 'enable_background%': 1, 315 'enable_background%': 1,
313 316
314 # Enable the task manager by default. 317 # Enable the task manager by default.
315 'enable_task_manager%': 1, 318 'enable_task_manager%': 1,
316 319
317 # Enable FTP support by default. 320 # Enable FTP support by default.
318 'disable_ftp_support%': 0, 321 'disable_ftp_support%': 0,
319 322
320 # XInput2 multitouch support is disabled by default (use_xi2_mt=0). 323 # XInput2 multitouch support is disabled by default (use_xi2_mt=0).
(...skipping 323 matching lines...) Expand 10 before | Expand all | Expand 10 after
644 'order_text_section%': '<(order_text_section)', 647 'order_text_section%': '<(order_text_section)',
645 'enable_extensions%': '<(enable_extensions)', 648 'enable_extensions%': '<(enable_extensions)',
646 'enable_web_intents%': '<(enable_web_intents)', 649 'enable_web_intents%': '<(enable_web_intents)',
647 'enable_web_intents_tag%': '<(enable_web_intents_tag)', 650 'enable_web_intents_tag%': '<(enable_web_intents_tag)',
648 'ios_sdk%': '<(ios_sdk)', 651 'ios_sdk%': '<(ios_sdk)',
649 'ios_deployment_target%': '<(ios_deployment_target)', 652 'ios_deployment_target%': '<(ios_deployment_target)',
650 'enable_plugin_installation%': '<(enable_plugin_installation)', 653 'enable_plugin_installation%': '<(enable_plugin_installation)',
651 'enable_protector_service%': '<(enable_protector_service)', 654 'enable_protector_service%': '<(enable_protector_service)',
652 'enable_session_service%': '<(enable_session_service)', 655 'enable_session_service%': '<(enable_session_service)',
653 'enable_themes%': '<(enable_themes)', 656 'enable_themes%': '<(enable_themes)',
657 'use_oem_wallpaper%': '<(use_oem_wallpaper)',
654 'enable_background%': '<(enable_background)', 658 'enable_background%': '<(enable_background)',
655 'linux_use_gold_binary%': '<(linux_use_gold_binary)', 659 'linux_use_gold_binary%': '<(linux_use_gold_binary)',
656 'linux_use_gold_flags%': '<(linux_use_gold_flags)', 660 'linux_use_gold_flags%': '<(linux_use_gold_flags)',
657 'use_canvas_skia%': '<(use_canvas_skia)', 661 'use_canvas_skia%': '<(use_canvas_skia)',
658 'test_isolation_mode%': '<(test_isolation_mode)', 662 'test_isolation_mode%': '<(test_isolation_mode)',
659 'test_isolation_outdir%': '<(test_isolation_outdir)', 663 'test_isolation_outdir%': '<(test_isolation_outdir)',
660 'enable_automation%': '<(enable_automation)', 664 'enable_automation%': '<(enable_automation)',
661 'enable_printing%': '<(enable_printing)', 665 'enable_printing%': '<(enable_printing)',
662 'enable_captive_portal_detection%': '<(enable_captive_portal_detection)', 666 'enable_captive_portal_detection%': '<(enable_captive_portal_detection)',
663 'disable_ftp_support%': '<(disable_ftp_support)', 667 'disable_ftp_support%': '<(disable_ftp_support)',
(...skipping 599 matching lines...) Expand 10 before | Expand all | Expand 10 after
1263 }], 1267 }],
1264 ['enable_extensions==1', { 1268 ['enable_extensions==1', {
1265 'grit_defines': ['-D', 'enable_extensions'], 1269 'grit_defines': ['-D', 'enable_extensions'],
1266 }], 1270 }],
1267 ['enable_printing==1', { 1271 ['enable_printing==1', {
1268 'grit_defines': ['-D', 'enable_printing'], 1272 'grit_defines': ['-D', 'enable_printing'],
1269 }], 1273 }],
1270 ['enable_themes==1', { 1274 ['enable_themes==1', {
1271 'grit_defines': ['-D', 'enable_themes'], 1275 'grit_defines': ['-D', 'enable_themes'],
1272 }], 1276 }],
1277 ['use_oem_wallpaper==1', {
1278 'grit_defines': ['-D', 'use_oem_wallpaper'],
1279 }],
1273 ['clang_use_chrome_plugins==1 and OS!="win"', { 1280 ['clang_use_chrome_plugins==1 and OS!="win"', {
1274 'clang_chrome_plugins_flags': [ 1281 'clang_chrome_plugins_flags': [
1275 '<!@(<(DEPTH)/tools/clang/scripts/plugin_flags.sh)' 1282 '<!@(<(DEPTH)/tools/clang/scripts/plugin_flags.sh)'
1276 ], 1283 ],
1277 }], 1284 }],
1278 1285
1279 ['enable_web_intents_tag==1', { 1286 ['enable_web_intents_tag==1', {
1280 'grit_defines': ['-D', 'enable_web_intents_tag'], 1287 'grit_defines': ['-D', 'enable_web_intents_tag'],
1281 }], 1288 }],
1282 1289
(...skipping 2233 matching lines...) Expand 10 before | Expand all | Expand 10 after
3516 # settings in target dicts. SYMROOT is a special case, because many other 3523 # settings in target dicts. SYMROOT is a special case, because many other
3517 # Xcode variables depend on it, including variables such as 3524 # Xcode variables depend on it, including variables such as
3518 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 3525 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
3519 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 3526 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
3520 # files to appear (when present) in the UI as actual files and not red 3527 # files to appear (when present) in the UI as actual files and not red
3521 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 3528 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
3522 # and therefore SYMROOT, needs to be set at the project level. 3529 # and therefore SYMROOT, needs to be set at the project level.
3523 'SYMROOT': '<(DEPTH)/xcodebuild', 3530 'SYMROOT': '<(DEPTH)/xcodebuild',
3524 }, 3531 },
3525 } 3532 }
OLDNEW
« no previous file with comments | « ash/resources/ash_wallpaper_resources.grd ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698