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 10320002: cros: Use touch theme assets with --touch-optimized-ui (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 7 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 | « no previous file | chrome/chrome_resources.gyp » ('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 25 matching lines...) Expand all
36 'use_openssl%': 0, 36 'use_openssl%': 0,
37 37
38 # Disable Virtual keyboard support by default. 38 # Disable Virtual keyboard support by default.
39 'use_virtual_keyboard%': 0, 39 'use_virtual_keyboard%': 0,
40 40
41 # Disable viewport meta tag by default. 41 # Disable viewport meta tag by default.
42 'enable_viewport%': 0, 42 'enable_viewport%': 0,
43 43
44 # Enable HiDPI support. 44 # Enable HiDPI support.
45 'enable_hidpi%': 0, 45 'enable_hidpi%': 0,
46
47 # Enable touch optimized art assets and metrics.
48 'enable_touch_ui%': 0,
46 49
47 # Enable Metro support. 50 # Enable Metro support.
48 'enable_metro%': 0, 51 'enable_metro%': 0,
49 }, 52 },
50 # Copy conditionally-set variables out one scope. 53 # Copy conditionally-set variables out one scope.
51 'chromeos%': '<(chromeos)', 54 'chromeos%': '<(chromeos)',
52 'use_aura%': '<(use_aura)', 55 'use_aura%': '<(use_aura)',
53 'use_ash%': '<(use_ash)', 56 'use_ash%': '<(use_ash)',
54 'enable_dip%': '<(enable_dip)', 57 'enable_dip%': '<(enable_dip)',
55 'use_openssl%': '<(use_openssl)', 58 'use_openssl%': '<(use_openssl)',
56 'use_virtual_keyboard%': '<(use_virtual_keyboard)', 59 'use_virtual_keyboard%': '<(use_virtual_keyboard)',
57 'enable_viewport%': '<(enable_viewport)', 60 'enable_viewport%': '<(enable_viewport)',
58 'enable_hidpi%': '<(enable_hidpi)', 61 'enable_hidpi%': '<(enable_hidpi)',
62 'enable_touch_ui%': '<(enable_touch_ui)',
59 'enable_metro%': '<(enable_metro)', 63 'enable_metro%': '<(enable_metro)',
60 64
61 # Compute the architecture that we're building on. 65 # Compute the architecture that we're building on.
62 'conditions': [ 66 'conditions': [
63 [ 'OS=="win" or OS=="mac"', { 67 [ 'OS=="win" or OS=="mac"', {
64 'host_arch%': 'ia32', 68 'host_arch%': 'ia32',
65 }, { 69 }, {
66 # This handles the Unix platforms for which there is some support. 70 # This handles the Unix platforms for which there is some support.
67 # Anything else gets passed through, which probably won't work very 71 # Anything else gets passed through, which probably won't work very
68 # well; such hosts should pass an explicit target_arch to gyp. 72 # well; such hosts should pass an explicit target_arch to gyp.
(...skipping 19 matching lines...) Expand all
88 ['OS=="win" or chromeos==1 or use_aura==1', { 92 ['OS=="win" or chromeos==1 or use_aura==1', {
89 'toolkit_views%': 1, 93 'toolkit_views%': 1,
90 }, { 94 }, {
91 'toolkit_views%': 0, 95 'toolkit_views%': 0,
92 }], 96 }],
93 97
94 # Enable HiDPI on Mac OS. 98 # Enable HiDPI on Mac OS.
95 ['OS=="mac"', { 99 ['OS=="mac"', {
96 'enable_hidpi%': 1, 100 'enable_hidpi%': 1,
97 }], 101 }],
102
103 # Enable touch UI on Metro and Chrome OS.
104 ['enable_metro==1 or chromeos==1', {
105 'enable_touch_ui%': 1,
sky 2012/05/02 16:12:21 Are you sure you want to set this now for chromeos
James Cook 2012/05/02 16:22:20 I think it's OK. It only actually changes the vis
106 }],
98 ], 107 ],
99 }, 108 },
100 109
101 # Copy conditionally-set variables out one scope. 110 # Copy conditionally-set variables out one scope.
102 'chromeos%': '<(chromeos)', 111 'chromeos%': '<(chromeos)',
103 'host_arch%': '<(host_arch)', 112 'host_arch%': '<(host_arch)',
104 'toolkit_views%': '<(toolkit_views)', 113 'toolkit_views%': '<(toolkit_views)',
105 'use_aura%': '<(use_aura)', 114 'use_aura%': '<(use_aura)',
106 'use_ash%': '<(use_ash)', 115 'use_ash%': '<(use_ash)',
107 'enable_dip%': '<(enable_dip)', 116 'enable_dip%': '<(enable_dip)',
108 'use_openssl%': '<(use_openssl)', 117 'use_openssl%': '<(use_openssl)',
109 'use_virtual_keyboard%': '<(use_virtual_keyboard)', 118 'use_virtual_keyboard%': '<(use_virtual_keyboard)',
110 'enable_viewport%': '<(enable_viewport)', 119 'enable_viewport%': '<(enable_viewport)',
111 'enable_hidpi%': '<(enable_hidpi)', 120 'enable_hidpi%': '<(enable_hidpi)',
121 'enable_touch_ui%': '<(enable_touch_ui)',
112 'enable_metro%': '<(enable_metro)', 122 'enable_metro%': '<(enable_metro)',
113 123
114 # We used to provide a variable for changing how libraries were built. 124 # We used to provide a variable for changing how libraries were built.
115 # This variable remains until we can clean up all the users. 125 # This variable remains until we can clean up all the users.
116 # This needs to be one nested variables dict in so that dependent 126 # This needs to be one nested variables dict in so that dependent
117 # gyp files can make use of it in their outer variables. (Yikes!) 127 # gyp files can make use of it in their outer variables. (Yikes!)
118 # http://code.google.com/p/chromium/issues/detail?id=83308 128 # http://code.google.com/p/chromium/issues/detail?id=83308
119 'library%': 'static_library', 129 'library%': 'static_library',
120 130
121 # Override branding to select the desired branding flavor. 131 # Override branding to select the desired branding flavor.
(...skipping 382 matching lines...) Expand 10 before | Expand all | Expand 10 after
504 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)', 514 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)',
505 'use_skia%': '<(use_skia)', 515 'use_skia%': '<(use_skia)',
506 'use_x11%': '<(use_x11)', 516 'use_x11%': '<(use_x11)',
507 'use_gnome_keyring%': '<(use_gnome_keyring)', 517 'use_gnome_keyring%': '<(use_gnome_keyring)',
508 'linux_fpic%': '<(linux_fpic)', 518 'linux_fpic%': '<(linux_fpic)',
509 'enable_pepper_threading%': '<(enable_pepper_threading)', 519 'enable_pepper_threading%': '<(enable_pepper_threading)',
510 'chromeos%': '<(chromeos)', 520 'chromeos%': '<(chromeos)',
511 'use_virtual_keyboard%': '<(use_virtual_keyboard)', 521 'use_virtual_keyboard%': '<(use_virtual_keyboard)',
512 'enable_viewport%': '<(enable_viewport)', 522 'enable_viewport%': '<(enable_viewport)',
513 'enable_hidpi%': '<(enable_hidpi)', 523 'enable_hidpi%': '<(enable_hidpi)',
524 'enable_touch_ui%': '<(enable_touch_ui)',
514 'enable_metro%': '<(enable_metro)', 525 'enable_metro%': '<(enable_metro)',
515 'use_xi2_mt%':'<(use_xi2_mt)', 526 'use_xi2_mt%':'<(use_xi2_mt)',
516 'file_manager_extension%': '<(file_manager_extension)', 527 'file_manager_extension%': '<(file_manager_extension)',
517 'webui_task_manager%': '<(webui_task_manager)', 528 'webui_task_manager%': '<(webui_task_manager)',
518 'inside_chromium_build%': '<(inside_chromium_build)', 529 'inside_chromium_build%': '<(inside_chromium_build)',
519 'fastbuild%': '<(fastbuild)', 530 'fastbuild%': '<(fastbuild)',
520 'dcheck_always_on%': '<(dcheck_always_on)', 531 'dcheck_always_on%': '<(dcheck_always_on)',
521 'python_ver%': '<(python_ver)', 532 'python_ver%': '<(python_ver)',
522 'armv7%': '<(armv7)', 533 'armv7%': '<(armv7)',
523 'arm_neon%': '<(arm_neon)', 534 'arm_neon%': '<(arm_neon)',
(...skipping 2512 matching lines...) Expand 10 before | Expand all | Expand 10 after
3036 # settings in target dicts. SYMROOT is a special case, because many other 3047 # settings in target dicts. SYMROOT is a special case, because many other
3037 # Xcode variables depend on it, including variables such as 3048 # Xcode variables depend on it, including variables such as
3038 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 3049 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
3039 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 3050 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
3040 # files to appear (when present) in the UI as actual files and not red 3051 # files to appear (when present) in the UI as actual files and not red
3041 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 3052 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
3042 # and therefore SYMROOT, needs to be set at the project level. 3053 # and therefore SYMROOT, needs to be set at the project level.
3043 'SYMROOT': '<(DEPTH)/xcodebuild', 3054 'SYMROOT': '<(DEPTH)/xcodebuild',
3044 }, 3055 },
3045 } 3056 }
OLDNEW
« no previous file with comments | « no previous file | chrome/chrome_resources.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698