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

Side by Side Diff: build/common.gypi

Issue 18298009: chromeos: Remove use_spring_wallpaper and use_oem_wallpaper. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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 | 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 335 matching lines...) Expand 10 before | Expand all | Expand 10 after
346 # Support for disabling depends on the platform. 346 # Support for disabling depends on the platform.
347 'enable_session_service%': 1, 347 'enable_session_service%': 1,
348 348
349 # Enables theme support, which is enabled by default. Support for 349 # Enables theme support, which is enabled by default. Support for
350 # disabling depends on the platform. 350 # disabling depends on the platform.
351 'enable_themes%': 1, 351 'enable_themes%': 1,
352 352
353 # Enables autofill dialog and associated features; disabled by default. 353 # Enables autofill dialog and associated features; disabled by default.
354 'enable_autofill_dialog%' : 0, 354 'enable_autofill_dialog%' : 0,
355 355
356 # Uses spring wallpaper resources on Spring.
357 'use_spring_wallpaper%': 0,
358
359 # Uses OEM-specific wallpaper resources on Chrome OS.
360 'use_oem_wallpaper%': 0,
361
362 # Enables support for background apps. 356 # Enables support for background apps.
363 'enable_background%': 1, 357 'enable_background%': 1,
364 358
365 # Enable the task manager by default. 359 # Enable the task manager by default.
366 'enable_task_manager%': 1, 360 'enable_task_manager%': 1,
367 361
368 # Enable FTP support by default. 362 # Enable FTP support by default.
369 'disable_ftp_support%': 0, 363 'disable_ftp_support%': 0,
370 364
371 # XInput2 multitouch support is disabled by default (use_xi2_mt=0). 365 # XInput2 multitouch support is disabled by default (use_xi2_mt=0).
(...skipping 423 matching lines...) Expand 10 before | Expand all | Expand 10 after
795 'tsan_blacklist%': '<(tsan_blacklist)', 789 'tsan_blacklist%': '<(tsan_blacklist)',
796 'clang_type_profiler%': '<(clang_type_profiler)', 790 'clang_type_profiler%': '<(clang_type_profiler)',
797 'order_profiling%': '<(order_profiling)', 791 'order_profiling%': '<(order_profiling)',
798 'order_text_section%': '<(order_text_section)', 792 'order_text_section%': '<(order_text_section)',
799 'enable_extensions%': '<(enable_extensions)', 793 'enable_extensions%': '<(enable_extensions)',
800 'enable_plugin_installation%': '<(enable_plugin_installation)', 794 'enable_plugin_installation%': '<(enable_plugin_installation)',
801 'enable_plugins%': '<(enable_plugins)', 795 'enable_plugins%': '<(enable_plugins)',
802 'enable_session_service%': '<(enable_session_service)', 796 'enable_session_service%': '<(enable_session_service)',
803 'enable_themes%': '<(enable_themes)', 797 'enable_themes%': '<(enable_themes)',
804 'enable_autofill_dialog%': '<(enable_autofill_dialog)', 798 'enable_autofill_dialog%': '<(enable_autofill_dialog)',
805 'use_spring_wallpaper%': '<(use_spring_wallpaper)',
806 'use_oem_wallpaper%': '<(use_oem_wallpaper)',
807 'enable_background%': '<(enable_background)', 799 'enable_background%': '<(enable_background)',
808 'linux_use_gold_binary%': '<(linux_use_gold_binary)', 800 'linux_use_gold_binary%': '<(linux_use_gold_binary)',
809 'linux_use_gold_flags%': '<(linux_use_gold_flags)', 801 'linux_use_gold_flags%': '<(linux_use_gold_flags)',
810 'linux_use_libgps%': '<(linux_use_libgps)', 802 'linux_use_libgps%': '<(linux_use_libgps)',
811 'use_canvas_skia%': '<(use_canvas_skia)', 803 'use_canvas_skia%': '<(use_canvas_skia)',
812 'test_isolation_mode%': '<(test_isolation_mode)', 804 'test_isolation_mode%': '<(test_isolation_mode)',
813 'test_isolation_outdir%': '<(test_isolation_outdir)', 805 'test_isolation_outdir%': '<(test_isolation_outdir)',
814 'test_isolation_fail_on_missing': '<(test_isolation_fail_on_missing)', 806 'test_isolation_fail_on_missing': '<(test_isolation_fail_on_missing)',
815 'enable_automation%': '<(enable_automation)', 807 'enable_automation%': '<(enable_automation)',
816 'enable_printing%': '<(enable_printing)', 808 'enable_printing%': '<(enable_printing)',
(...skipping 744 matching lines...) Expand 10 before | Expand all | Expand 10 after
1561 }], 1553 }],
1562 ['enable_extensions==1', { 1554 ['enable_extensions==1', {
1563 'grit_defines': ['-D', 'enable_extensions'], 1555 'grit_defines': ['-D', 'enable_extensions'],
1564 }], 1556 }],
1565 ['enable_printing==1', { 1557 ['enable_printing==1', {
1566 'grit_defines': ['-D', 'enable_printing'], 1558 'grit_defines': ['-D', 'enable_printing'],
1567 }], 1559 }],
1568 ['enable_themes==1', { 1560 ['enable_themes==1', {
1569 'grit_defines': ['-D', 'enable_themes'], 1561 'grit_defines': ['-D', 'enable_themes'],
1570 }], 1562 }],
1571 ['use_spring_wallpaper==1', {
1572 'grit_defines': ['-D', 'use_spring_wallpaper'],
1573 }],
1574 ['use_oem_wallpaper==1', {
1575 'grit_defines': ['-D', 'use_oem_wallpaper'],
1576 }],
1577 ['enable_app_list==1', { 1563 ['enable_app_list==1', {
1578 'grit_defines': ['-D', 'enable_app_list'], 1564 'grit_defines': ['-D', 'enable_app_list'],
1579 }], 1565 }],
1580 ['enable_settings_app==1', { 1566 ['enable_settings_app==1', {
1581 'grit_defines': ['-D', 'enable_settings_app'], 1567 'grit_defines': ['-D', 'enable_settings_app'],
1582 }], 1568 }],
1583 ['enable_google_now==1', { 1569 ['enable_google_now==1', {
1584 'grit_defines': ['-D', 'enable_google_now'], 1570 'grit_defines': ['-D', 'enable_google_now'],
1585 }], 1571 }],
1586 ['use_concatenated_impulse_responses==1', { 1572 ['use_concatenated_impulse_responses==1', {
(...skipping 3047 matching lines...) Expand 10 before | Expand all | Expand 10 after
4634 # settings in target dicts. SYMROOT is a special case, because many other 4620 # settings in target dicts. SYMROOT is a special case, because many other
4635 # Xcode variables depend on it, including variables such as 4621 # Xcode variables depend on it, including variables such as
4636 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4622 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4637 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4623 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4638 # files to appear (when present) in the UI as actual files and not red 4624 # files to appear (when present) in the UI as actual files and not red
4639 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4625 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4640 # and therefore SYMROOT, needs to be set at the project level. 4626 # and therefore SYMROOT, needs to be set at the project level.
4641 'SYMROOT': '<(DEPTH)/xcodebuild', 4627 'SYMROOT': '<(DEPTH)/xcodebuild',
4642 }, 4628 },
4643 } 4629 }
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