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

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. 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
« no previous file with comments | « no previous file | chrome/browser/bookmarks/bookmark_context_menu_controller.cc » ('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) 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 16 matching lines...) Expand all
27 # Whether the Views toolkit can use its Pure form when available 27 # Whether the Views toolkit can use its Pure form when available
28 # or if it must only use GTK (the default at the moment). 28 # or if it must only use GTK (the default at the moment).
29 # This is an intermediate step until all of Views is 'Pure', 29 # This is an intermediate step until all of Views is 'Pure',
30 # at which point we plan to remove those switches. 30 # at which point we plan to remove those switches.
31 # This turns on the USE_ONLY_PURE_VIEWS macro. 31 # This turns on the USE_ONLY_PURE_VIEWS macro.
32 'use_only_pure_views%': 0, 32 'use_only_pure_views%': 0,
33 33
34 # Disable touch support by default. 34 # Disable touch support by default.
35 'touchui%': 0, 35 'touchui%': 0,
36 36
37 # Disable webui dialog replacements for native dialogs by default.
38 # TODO(flackr): Change this to a runtime flag triggered by
39 # --pure-views so that these dialogs can be easily tested.
40 'webui_dialogs%': 0,
41
42 # Whether the compositor is enabled on views. 37 # Whether the compositor is enabled on views.
43 'views_compositor%': 0, 38 'views_compositor%': 0,
44 39
45 # Whether or not we are building with the Aura window manager. 40 # Whether or not we are building with the Aura window manager.
46 'use_aura%': 0, 41 'use_aura%': 0,
47 }, 42 },
48 # Copy conditionally-set variables out one scope. 43 # Copy conditionally-set variables out one scope.
49 'chromeos%': '<(chromeos)', 44 'chromeos%': '<(chromeos)',
50 'use_only_pure_views%': '<(use_only_pure_views)', 45 'use_only_pure_views%': '<(use_only_pure_views)',
51 'touchui%': '<(touchui)', 46 'touchui%': '<(touchui)',
52 'webui_dialogs%': '<(webui_dialogs)',
53 'views_compositor%': '<(views_compositor)', 47 'views_compositor%': '<(views_compositor)',
54 'use_aura%': '<(use_aura)', 48 'use_aura%': '<(use_aura)',
55 49
56 # Compute the architecture that we're building on. 50 # Compute the architecture that we're building on.
57 'conditions': [ 51 'conditions': [
58 [ 'OS=="win" or OS=="mac"', { 52 [ 'OS=="win" or OS=="mac"', {
59 'host_arch%': 'ia32', 53 'host_arch%': 'ia32',
60 }, { 54 }, {
61 # This handles the Unix platforms for which there is some support. 55 # This handles the Unix platforms for which there is some support.
62 # Anything else gets passed through, which probably won't work very 56 # Anything else gets passed through, which probably won't work very
(...skipping 10 matching lines...) Expand all
73 'toolkit_views%': 0, 67 'toolkit_views%': 0,
74 }], 68 }],
75 69
76 # Views are always Pure in Touch and Aura case. 70 # Views are always Pure in Touch and Aura case.
77 ['touchui==1 or use_aura==1', { 71 ['touchui==1 or use_aura==1', {
78 'use_only_pure_views%': 1, 72 'use_only_pure_views%': 1,
79 }, { 73 }, {
80 'use_only_pure_views%': 0, 74 'use_only_pure_views%': 0,
81 }], 75 }],
82 76
83 # Use WebUI dialogs in TouchUI and PureView builds.
84 ['touchui==1 or use_only_pure_views==1 or use_aura==1', {
85 'webui_dialogs%': 1,
86 }],
87
88 # Use the views compositor when using the Aura window manager. 77 # Use the views compositor when using the Aura window manager.
89 ['use_aura==1', { 78 ['use_aura==1', {
90 'views_compositor%': 1, 79 'views_compositor%': 1,
91 }], 80 }],
92 ], 81 ],
93 }, 82 },
94 83
95 # Copy conditionally-set variables out one scope. 84 # Copy conditionally-set variables out one scope.
96 'chromeos%': '<(chromeos)', 85 'chromeos%': '<(chromeos)',
97 'touchui%': '<(touchui)', 86 'touchui%': '<(touchui)',
98 'webui_dialogs%': '<(webui_dialogs)',
99 'host_arch%': '<(host_arch)', 87 'host_arch%': '<(host_arch)',
100 'toolkit_views%': '<(toolkit_views)', 88 'toolkit_views%': '<(toolkit_views)',
101 'use_only_pure_views%': '<(use_only_pure_views)', 89 'use_only_pure_views%': '<(use_only_pure_views)',
102 'views_compositor%': '<(views_compositor)', 90 'views_compositor%': '<(views_compositor)',
103 'use_aura%': '<(use_aura)', 91 'use_aura%': '<(use_aura)',
104 92
105 # We used to provide a variable for changing how libraries were built. 93 # We used to provide a variable for changing how libraries were built.
106 # This variable remains until we can clean up all the users. 94 # This variable remains until we can clean up all the users.
107 # This needs to be one nested variables dict in so that dependent 95 # This needs to be one nested variables dict in so that dependent
108 # gyp files can make use of it in their outer variables. (Yikes!) 96 # gyp files can make use of it in their outer variables. (Yikes!)
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after
301 'use_aura%': '<(use_aura)', 289 'use_aura%': '<(use_aura)',
302 'os_posix%': '<(os_posix)', 290 'os_posix%': '<(os_posix)',
303 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)', 291 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)',
304 'use_skia%': '<(use_skia)', 292 'use_skia%': '<(use_skia)',
305 'use_x11%': '<(use_x11)', 293 'use_x11%': '<(use_x11)',
306 'use_gnome_keyring%': '<(use_gnome_keyring)', 294 'use_gnome_keyring%': '<(use_gnome_keyring)',
307 'linux_fpic%': '<(linux_fpic)', 295 'linux_fpic%': '<(linux_fpic)',
308 'enable_flapper_hacks%': '<(enable_flapper_hacks)', 296 'enable_flapper_hacks%': '<(enable_flapper_hacks)',
309 'chromeos%': '<(chromeos)', 297 'chromeos%': '<(chromeos)',
310 'touchui%': '<(touchui)', 298 'touchui%': '<(touchui)',
311 'webui_dialogs%': '<(webui_dialogs)',
312 'file_manager_extension%': '<(file_manager_extension)', 299 'file_manager_extension%': '<(file_manager_extension)',
313 'webui_task_manager%': '<(webui_task_manager)', 300 'webui_task_manager%': '<(webui_task_manager)',
314 'inside_chromium_build%': '<(inside_chromium_build)', 301 'inside_chromium_build%': '<(inside_chromium_build)',
315 'fastbuild%': '<(fastbuild)', 302 'fastbuild%': '<(fastbuild)',
316 'python_ver%': '<(python_ver)', 303 'python_ver%': '<(python_ver)',
317 'armv7%': '<(armv7)', 304 'armv7%': '<(armv7)',
318 'arm_neon%': '<(arm_neon)', 305 'arm_neon%': '<(arm_neon)',
319 'sysroot%': '<(sysroot)', 306 'sysroot%': '<(sysroot)',
320 'disable_sse2%': '<(disable_sse2)', 307 'disable_sse2%': '<(disable_sse2)',
321 'component%': '<(component)', 308 'component%': '<(component)',
(...skipping 342 matching lines...) Expand 10 before | Expand all | Expand 10 after
664 }], 651 }],
665 ['use_only_pure_views==1', { 652 ['use_only_pure_views==1', {
666 'grit_defines': ['-D', 'use_only_pure_views'], 653 'grit_defines': ['-D', 'use_only_pure_views'],
667 }], 654 }],
668 ['use_aura==1', { 655 ['use_aura==1', {
669 'grit_defines': ['-D', 'use_aura'], 656 'grit_defines': ['-D', 'use_aura'],
670 }], 657 }],
671 ['touchui==1', { 658 ['touchui==1', {
672 'grit_defines': ['-D', 'touchui'], 659 'grit_defines': ['-D', 'touchui'],
673 }], 660 }],
674 ['webui_dialogs==1', {
675 'grit_defines': ['-D', 'webui_dialogs'],
676 }],
677 ['file_manager_extension==1', { 661 ['file_manager_extension==1', {
678 'grit_defines': ['-D', 'file_manager_extension'], 662 'grit_defines': ['-D', 'file_manager_extension'],
679 }], 663 }],
680 ['webui_task_manager==1', { 664 ['webui_task_manager==1', {
681 'grit_defines': ['-D', 'webui_task_manager'], 665 'grit_defines': ['-D', 'webui_task_manager'],
682 }], 666 }],
683 ['remoting==1', { 667 ['remoting==1', {
684 'grit_defines': ['-D', 'remoting'], 668 'grit_defines': ['-D', 'remoting'],
685 }], 669 }],
686 ['use_titlecase_in_grd_files==1', { 670 ['use_titlecase_in_grd_files==1', {
(...skipping 1368 matching lines...) Expand 10 before | Expand all | Expand 10 after
2055 # settings in target dicts. SYMROOT is a special case, because many other 2039 # settings in target dicts. SYMROOT is a special case, because many other
2056 # Xcode variables depend on it, including variables such as 2040 # Xcode variables depend on it, including variables such as
2057 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 2041 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
2058 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 2042 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
2059 # files to appear (when present) in the UI as actual files and not red 2043 # files to appear (when present) in the UI as actual files and not red
2060 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 2044 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
2061 # and therefore SYMROOT, needs to be set at the project level. 2045 # and therefore SYMROOT, needs to be set at the project level.
2062 'SYMROOT': '<(DEPTH)/xcodebuild', 2046 'SYMROOT': '<(DEPTH)/xcodebuild',
2063 }, 2047 },
2064 } 2048 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/bookmarks/bookmark_context_menu_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698