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

Side by Side Diff: build/common.gypi

Issue 7572022: Use bookmark manager to add/edit bookmark pages with webui_dialogs=1. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Reviewer cleanup. Created 9 years, 4 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 certificate viewer until it is complete. 38 # Disable webui dialog replacements for native dialogs by default.
39 'webui_certificate_viewer%': 0, 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,
40 42
41 # Whether the compositor is enabled on views. 43 # Whether the compositor is enabled on views.
42 'views_compositor%': 0, 44 'views_compositor%': 0,
43 }, 45 },
44 # Copy conditionally-set variables out one scope. 46 # Copy conditionally-set variables out one scope.
45 'chromeos%': '<(chromeos)', 47 'chromeos%': '<(chromeos)',
46 'toolkit_uses_pure_views%': '<(toolkit_uses_pure_views)', 48 'toolkit_uses_pure_views%': '<(toolkit_uses_pure_views)',
47 'touchui%': '<(touchui)', 49 'touchui%': '<(touchui)',
48 'webui_certificate_viewer%': '<(webui_certificate_viewer)', 50 'webui_dialogs%': '<(webui_dialogs)',
49 'views_compositor%': '<(views_compositor)', 51 'views_compositor%': '<(views_compositor)',
50 52
51 # Compute the architecture that we're building on. 53 # Compute the architecture that we're building on.
52 'conditions': [ 54 'conditions': [
53 [ 'OS=="win" or OS=="mac"', { 55 [ 'OS=="win" or OS=="mac"', {
54 'host_arch%': 'ia32', 56 'host_arch%': 'ia32',
55 }, { 57 }, {
56 # This handles the Unix platforms for which there is some support. 58 # This handles the Unix platforms for which there is some support.
57 # Anything else gets passed through, which probably won't work very 59 # Anything else gets passed through, which probably won't work very
58 # well; such hosts should pass an explicit target_arch to gyp. 60 # well; such hosts should pass an explicit target_arch to gyp.
59 'host_arch%': 61 'host_arch%':
60 '<!(uname -m | sed -e "s/i.86/ia32/;s/x86_64/x64/;s/amd64/x64/;s/a rm.*/arm/;s/i86pc/ia32/")', 62 '<!(uname -m | sed -e "s/i.86/ia32/;s/x86_64/x64/;s/amd64/x64/;s/a rm.*/arm/;s/i86pc/ia32/")',
61 }], 63 }],
62 64
63 # Set default value of toolkit_views on for Windows, Chrome OS 65 # Set default value of toolkit_views on for Windows, Chrome OS
64 # and the touch UI. 66 # and the touch UI.
65 ['OS=="win" or chromeos==1 or touchui==1 or toolkit_uses_pure_views==1 ', { 67 ['OS=="win" or chromeos==1 or touchui==1 or toolkit_uses_pure_views==1 ', {
66 'toolkit_views%': 1, 68 'toolkit_views%': 1,
67 }, { 69 }, {
68 'toolkit_views%': 0, 70 'toolkit_views%': 0,
69 }], 71 }],
70 72
71 # Views are always Pure in Touch case 73 # Views are always Pure in Touch case
72 ['touchui==1', { 74 ['touchui==1', {
73 'toolkit_uses_pure_views%': 1, 75 'toolkit_uses_pure_views%': 1,
74 }, { 76 }, {
75 'toolkit_uses_pure_views%': 0, 77 'toolkit_uses_pure_views%': 0,
76 }], 78 }],
77 79
78 # Use WebUI certificate viewer in Touch case 80 # Use WebUI dialogs in TouchUI builds.
79 ['touchui==1', { 81 ['touchui==1', {
80 'webui_certificate_viewer%': 1 82 'webui_dialogs%': 1,
81 }], 83 }],
82 ], 84 ],
83 }, 85 },
84 86
85 # Copy conditionally-set variables out one scope. 87 # Copy conditionally-set variables out one scope.
86 'chromeos%': '<(chromeos)', 88 'chromeos%': '<(chromeos)',
87 'touchui%': '<(touchui)', 89 'touchui%': '<(touchui)',
88 'webui_certificate_viewer%': '<(webui_certificate_viewer)', 90 'webui_dialogs%': '<(webui_dialogs)',
89 'host_arch%': '<(host_arch)', 91 'host_arch%': '<(host_arch)',
90 'toolkit_views%': '<(toolkit_views)', 92 'toolkit_views%': '<(toolkit_views)',
91 'toolkit_uses_pure_views%': '<(toolkit_uses_pure_views)', 93 'toolkit_uses_pure_views%': '<(toolkit_uses_pure_views)',
92 'views_compositor%': '<(views_compositor)', 94 'views_compositor%': '<(views_compositor)',
93 95
94 # We used to provide a variable for changing how libraries were built. 96 # We used to provide a variable for changing how libraries were built.
95 # This variable remains until we can clean up all the users. 97 # This variable remains until we can clean up all the users.
96 # This needs to be one nested variables dict in so that dependent 98 # This needs to be one nested variables dict in so that dependent
97 # gyp files can make use of it in their outer variables. (Yikes!) 99 # gyp files can make use of it in their outer variables. (Yikes!)
98 # http://code.google.com/p/chromium/issues/detail?id=83308 100 # http://code.google.com/p/chromium/issues/detail?id=83308
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after
280 'views_compositor%': '<(views_compositor)', 282 'views_compositor%': '<(views_compositor)',
281 'os_posix%': '<(os_posix)', 283 'os_posix%': '<(os_posix)',
282 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)', 284 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)',
283 'use_skia%': '<(use_skia)', 285 'use_skia%': '<(use_skia)',
284 'use_x11%': '<(use_x11)', 286 'use_x11%': '<(use_x11)',
285 'use_gnome_keyring%': '<(use_gnome_keyring)', 287 'use_gnome_keyring%': '<(use_gnome_keyring)',
286 'linux_fpic%': '<(linux_fpic)', 288 'linux_fpic%': '<(linux_fpic)',
287 'enable_flapper_hacks%': '<(enable_flapper_hacks)', 289 'enable_flapper_hacks%': '<(enable_flapper_hacks)',
288 'chromeos%': '<(chromeos)', 290 'chromeos%': '<(chromeos)',
289 'touchui%': '<(touchui)', 291 'touchui%': '<(touchui)',
290 'webui_certificate_viewer%': '<(webui_certificate_viewer)', 292 'webui_dialogs%': '<(webui_dialogs)',
291 'file_manager_extension%': '<(file_manager_extension)', 293 'file_manager_extension%': '<(file_manager_extension)',
292 'webui_task_manager%': '<(webui_task_manager)', 294 'webui_task_manager%': '<(webui_task_manager)',
293 'inside_chromium_build%': '<(inside_chromium_build)', 295 'inside_chromium_build%': '<(inside_chromium_build)',
294 'fastbuild%': '<(fastbuild)', 296 'fastbuild%': '<(fastbuild)',
295 'python_ver%': '<(python_ver)', 297 'python_ver%': '<(python_ver)',
296 'armv7%': '<(armv7)', 298 'armv7%': '<(armv7)',
297 'arm_neon%': '<(arm_neon)', 299 'arm_neon%': '<(arm_neon)',
298 'sysroot%': '<(sysroot)', 300 'sysroot%': '<(sysroot)',
299 'disable_sse2%': '<(disable_sse2)', 301 'disable_sse2%': '<(disable_sse2)',
300 'component%': '<(component)', 302 'component%': '<(component)',
(...skipping 344 matching lines...) Expand 10 before | Expand all | Expand 10 after
645 }], 647 }],
646 ['toolkit_views==1', { 648 ['toolkit_views==1', {
647 'grit_defines': ['-D', 'toolkit_views'], 649 'grit_defines': ['-D', 'toolkit_views'],
648 }], 650 }],
649 ['toolkit_uses_pure_views==1', { 651 ['toolkit_uses_pure_views==1', {
650 'grit_defines': ['-D', 'toolkit_uses_pure_views'], 652 'grit_defines': ['-D', 'toolkit_uses_pure_views'],
651 }], 653 }],
652 ['touchui==1', { 654 ['touchui==1', {
653 'grit_defines': ['-D', 'touchui'], 655 'grit_defines': ['-D', 'touchui'],
654 }], 656 }],
655 ['webui_certificate_viewer==1', { 657 ['webui_dialogs==1', {
656 'grit_defines': ['-D', 'webui_certificate_viewer'], 658 'grit_defines': ['-D', 'webui_dialogs'],
657 }], 659 }],
658 ['file_manager_extension==1', { 660 ['file_manager_extension==1', {
659 'grit_defines': ['-D', 'file_manager_extension'], 661 'grit_defines': ['-D', 'file_manager_extension'],
660 }], 662 }],
661 ['webui_task_manager==1', { 663 ['webui_task_manager==1', {
662 'grit_defines': ['-D', 'webui_task_manager'], 664 'grit_defines': ['-D', 'webui_task_manager'],
663 }], 665 }],
664 ['remoting==1', { 666 ['remoting==1', {
665 'grit_defines': ['-D', 'remoting'], 667 'grit_defines': ['-D', 'remoting'],
666 }], 668 }],
(...skipping 1291 matching lines...) Expand 10 before | Expand all | Expand 10 after
1958 # settings in target dicts. SYMROOT is a special case, because many other 1960 # settings in target dicts. SYMROOT is a special case, because many other
1959 # Xcode variables depend on it, including variables such as 1961 # Xcode variables depend on it, including variables such as
1960 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 1962 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
1961 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 1963 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
1962 # files to appear (when present) in the UI as actual files and not red 1964 # files to appear (when present) in the UI as actual files and not red
1963 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 1965 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
1964 # and therefore SYMROOT, needs to be set at the project level. 1966 # and therefore SYMROOT, needs to be set at the project level.
1965 'SYMROOT': '<(DEPTH)/xcodebuild', 1967 'SYMROOT': '<(DEPTH)/xcodebuild',
1966 }, 1968 },
1967 } 1969 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698