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

Side by Side Diff: build/common.gypi

Issue 7670041: Add --use-more-webui runtime flag to toggle WebUI replacements for native dialogs. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Merge with trunk and fix hung renderer dialog close. Created 9 years, 3 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
OLDNEW
1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 17 matching lines...) Expand all
28 # This turns on the TOOLKIT_USES_PURE_VIEWS macro which is used 28 # This turns on the TOOLKIT_USES_PURE_VIEWS macro which is used
29 # to replace the corresponding GTK implementation in such a way 29 # to replace the corresponding GTK implementation in such a way
30 # that GTK and PureViews can coexist. This intermediate solution 30 # that GTK and PureViews can coexist. This intermediate solution
31 # allow us to switch the view implementations using 31 # allow us to switch the view implementations using
32 # --use-pure-views, without breaking exiting gtk implementation. 32 # --use-pure-views, without breaking exiting gtk implementation.
33 'toolkit_uses_pure_views%': 0, 33 'toolkit_uses_pure_views%': 0,
34 34
35 # Disable touch support by default. 35 # Disable touch support by default.
36 'touchui%': 0, 36 'touchui%': 0,
37 37
38 # Disable webui dialog replacements for native dialogs by default.
39 # TODO(flackr): Change this to a runtime flag triggered by
40 # --pure-views so that these dialogs can be easily tested.
41 'webui_dialogs%': 0,
42
43 # Whether the compositor is enabled on views. 38 # Whether the compositor is enabled on views.
44 'views_compositor%': 0, 39 'views_compositor%': 0,
45 40
46 # Whether or not we are building with the Aura window manager. 41 # Whether or not we are building with the Aura window manager.
47 'use_aura%': 0, 42 'use_aura%': 0,
48 }, 43 },
49 # Copy conditionally-set variables out one scope. 44 # Copy conditionally-set variables out one scope.
50 'chromeos%': '<(chromeos)', 45 'chromeos%': '<(chromeos)',
51 'toolkit_uses_pure_views%': '<(toolkit_uses_pure_views)', 46 'toolkit_uses_pure_views%': '<(toolkit_uses_pure_views)',
52 'touchui%': '<(touchui)', 47 'touchui%': '<(touchui)',
53 'webui_dialogs%': '<(webui_dialogs)',
54 'views_compositor%': '<(views_compositor)', 48 'views_compositor%': '<(views_compositor)',
55 'use_aura%': '<(use_aura)', 49 'use_aura%': '<(use_aura)',
56 50
57 # Compute the architecture that we're building on. 51 # Compute the architecture that we're building on.
58 'conditions': [ 52 'conditions': [
59 [ 'OS=="win" or OS=="mac"', { 53 [ 'OS=="win" or OS=="mac"', {
60 'host_arch%': 'ia32', 54 'host_arch%': 'ia32',
61 }, { 55 }, {
62 # This handles the Unix platforms for which there is some support. 56 # This handles the Unix platforms for which there is some support.
63 # Anything else gets passed through, which probably won't work very 57 # Anything else gets passed through, which probably won't work very
(...skipping 10 matching lines...) Expand all
74 'toolkit_views%': 0, 68 'toolkit_views%': 0,
75 }], 69 }],
76 70
77 # Views are always Pure in Touch case 71 # Views are always Pure in Touch case
78 ['touchui==1', { 72 ['touchui==1', {
79 'toolkit_uses_pure_views%': 1, 73 'toolkit_uses_pure_views%': 1,
80 }, { 74 }, {
81 'toolkit_uses_pure_views%': 0, 75 'toolkit_uses_pure_views%': 0,
82 }], 76 }],
83 77
84 # Use WebUI dialogs in TouchUI builds.
85 ['touchui==1', {
86 'webui_dialogs%': 1,
87 }],
88
89 # Use the views compositor when using the Aura window manager. 78 # Use the views compositor when using the Aura window manager.
90 ['use_aura==1', { 79 ['use_aura==1', {
91 'views_compositor%': 1, 80 'views_compositor%': 1,
92 }], 81 }],
93 ], 82 ],
94 }, 83 },
95 84
96 # Copy conditionally-set variables out one scope. 85 # Copy conditionally-set variables out one scope.
97 'chromeos%': '<(chromeos)', 86 'chromeos%': '<(chromeos)',
98 'touchui%': '<(touchui)', 87 'touchui%': '<(touchui)',
99 'webui_dialogs%': '<(webui_dialogs)',
100 'host_arch%': '<(host_arch)', 88 'host_arch%': '<(host_arch)',
101 'toolkit_views%': '<(toolkit_views)', 89 'toolkit_views%': '<(toolkit_views)',
102 'toolkit_uses_pure_views%': '<(toolkit_uses_pure_views)', 90 'toolkit_uses_pure_views%': '<(toolkit_uses_pure_views)',
103 'views_compositor%': '<(views_compositor)', 91 'views_compositor%': '<(views_compositor)',
104 'use_aura%': '<(use_aura)', 92 'use_aura%': '<(use_aura)',
105 93
106 # We used to provide a variable for changing how libraries were built. 94 # We used to provide a variable for changing how libraries were built.
107 # This variable remains until we can clean up all the users. 95 # This variable remains until we can clean up all the users.
108 # This needs to be one nested variables dict in so that dependent 96 # This needs to be one nested variables dict in so that dependent
109 # gyp files can make use of it in their outer variables. (Yikes!) 97 # gyp files can make use of it in their outer variables. (Yikes!)
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
298 'use_aura%': '<(use_aura)', 286 'use_aura%': '<(use_aura)',
299 'os_posix%': '<(os_posix)', 287 'os_posix%': '<(os_posix)',
300 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)', 288 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)',
301 'use_skia%': '<(use_skia)', 289 'use_skia%': '<(use_skia)',
302 'use_x11%': '<(use_x11)', 290 'use_x11%': '<(use_x11)',
303 'use_gnome_keyring%': '<(use_gnome_keyring)', 291 'use_gnome_keyring%': '<(use_gnome_keyring)',
304 'linux_fpic%': '<(linux_fpic)', 292 'linux_fpic%': '<(linux_fpic)',
305 'enable_flapper_hacks%': '<(enable_flapper_hacks)', 293 'enable_flapper_hacks%': '<(enable_flapper_hacks)',
306 'chromeos%': '<(chromeos)', 294 'chromeos%': '<(chromeos)',
307 'touchui%': '<(touchui)', 295 'touchui%': '<(touchui)',
308 'webui_dialogs%': '<(webui_dialogs)',
309 'file_manager_extension%': '<(file_manager_extension)', 296 'file_manager_extension%': '<(file_manager_extension)',
310 'webui_task_manager%': '<(webui_task_manager)', 297 'webui_task_manager%': '<(webui_task_manager)',
311 'inside_chromium_build%': '<(inside_chromium_build)', 298 'inside_chromium_build%': '<(inside_chromium_build)',
312 'fastbuild%': '<(fastbuild)', 299 'fastbuild%': '<(fastbuild)',
313 'python_ver%': '<(python_ver)', 300 'python_ver%': '<(python_ver)',
314 'armv7%': '<(armv7)', 301 'armv7%': '<(armv7)',
315 'arm_neon%': '<(arm_neon)', 302 'arm_neon%': '<(arm_neon)',
316 'sysroot%': '<(sysroot)', 303 'sysroot%': '<(sysroot)',
317 'disable_sse2%': '<(disable_sse2)', 304 'disable_sse2%': '<(disable_sse2)',
318 'component%': '<(component)', 305 'component%': '<(component)',
(...skipping 352 matching lines...) Expand 10 before | Expand all | Expand 10 after
671 }], 658 }],
672 ['toolkit_views==1', { 659 ['toolkit_views==1', {
673 'grit_defines': ['-D', 'toolkit_views'], 660 'grit_defines': ['-D', 'toolkit_views'],
674 }], 661 }],
675 ['toolkit_uses_pure_views==1', { 662 ['toolkit_uses_pure_views==1', {
676 'grit_defines': ['-D', 'toolkit_uses_pure_views'], 663 'grit_defines': ['-D', 'toolkit_uses_pure_views'],
677 }], 664 }],
678 ['touchui==1', { 665 ['touchui==1', {
679 'grit_defines': ['-D', 'touchui'], 666 'grit_defines': ['-D', 'touchui'],
680 }], 667 }],
681 ['webui_dialogs==1', {
682 'grit_defines': ['-D', 'webui_dialogs'],
683 }],
684 ['file_manager_extension==1', { 668 ['file_manager_extension==1', {
685 'grit_defines': ['-D', 'file_manager_extension'], 669 'grit_defines': ['-D', 'file_manager_extension'],
686 }], 670 }],
687 ['webui_task_manager==1', { 671 ['webui_task_manager==1', {
688 'grit_defines': ['-D', 'webui_task_manager'], 672 'grit_defines': ['-D', 'webui_task_manager'],
689 }], 673 }],
690 ['remoting==1', { 674 ['remoting==1', {
691 'grit_defines': ['-D', 'remoting'], 675 'grit_defines': ['-D', 'remoting'],
692 }], 676 }],
693 ['use_titlecase_in_grd_files==1', { 677 ['use_titlecase_in_grd_files==1', {
(...skipping 1358 matching lines...) Expand 10 before | Expand all | Expand 10 after
2052 # settings in target dicts. SYMROOT is a special case, because many other 2036 # settings in target dicts. SYMROOT is a special case, because many other
2053 # Xcode variables depend on it, including variables such as 2037 # Xcode variables depend on it, including variables such as
2054 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 2038 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
2055 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 2039 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
2056 # files to appear (when present) in the UI as actual files and not red 2040 # files to appear (when present) in the UI as actual files and not red
2057 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 2041 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
2058 # and therefore SYMROOT, needs to be set at the project level. 2042 # and therefore SYMROOT, needs to be set at the project level.
2059 'SYMROOT': '<(DEPTH)/xcodebuild', 2043 'SYMROOT': '<(DEPTH)/xcodebuild',
2060 }, 2044 },
2061 } 2045 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698