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

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: 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 bookmark editor until completion.
Rick Byers 2011/08/04 18:26:07 Perhaps we should consider combining these now int
flackr 2011/08/12 18:11:24 Done.
39 'webui_bookmark_editor%': 0,
40
38 # Disable webui certificate viewer until it is complete. 41 # Disable webui certificate viewer until it is complete.
39 'webui_certificate_viewer%': 0, 42 'webui_certificate_viewer%': 0,
40 43
41 # Whether the compositor is enabled on views. 44 # Whether the compositor is enabled on views.
42 'views_compositor%': 0, 45 'views_compositor%': 0,
43 }, 46 },
44 # Copy conditionally-set variables out one scope. 47 # Copy conditionally-set variables out one scope.
45 'chromeos%': '<(chromeos)', 48 'chromeos%': '<(chromeos)',
46 'toolkit_uses_pure_views%': '<(toolkit_uses_pure_views)', 49 'toolkit_uses_pure_views%': '<(toolkit_uses_pure_views)',
47 'touchui%': '<(touchui)', 50 'touchui%': '<(touchui)',
51 'webui_bookmark_editor%': '<(webui_bookmark_editor)',
48 'webui_certificate_viewer%': '<(webui_certificate_viewer)', 52 'webui_certificate_viewer%': '<(webui_certificate_viewer)',
49 'views_compositor%': '<(views_compositor)', 53 'views_compositor%': '<(views_compositor)',
50 54
51 # Compute the architecture that we're building on. 55 # Compute the architecture that we're building on.
52 'conditions': [ 56 'conditions': [
53 [ 'OS=="win" or OS=="mac"', { 57 [ 'OS=="win" or OS=="mac"', {
54 'host_arch%': 'ia32', 58 'host_arch%': 'ia32',
55 }, { 59 }, {
56 # This handles the Unix platforms for which there is some support. 60 # This handles the Unix platforms for which there is some support.
57 # Anything else gets passed through, which probably won't work very 61 # Anything else gets passed through, which probably won't work very
(...skipping 10 matching lines...) Expand all
68 'toolkit_views%': 0, 72 'toolkit_views%': 0,
69 }], 73 }],
70 74
71 # Views are always Pure in Touch case 75 # Views are always Pure in Touch case
72 ['touchui==1', { 76 ['touchui==1', {
73 'toolkit_uses_pure_views%': 1, 77 'toolkit_uses_pure_views%': 1,
74 }, { 78 }, {
75 'toolkit_uses_pure_views%': 0, 79 'toolkit_uses_pure_views%': 0,
76 }], 80 }],
77 81
78 # Use WebUI certificate viewer in Touch case 82 # Use WebUI certificate viewer in Touch case
Rick Byers 2011/08/04 18:26:07 update comment
flackr 2011/08/12 18:11:24 Done.
79 ['touchui==1', { 83 ['touchui==1', {
80 'webui_certificate_viewer%': 1 84 'webui_certificate_viewer%': 1,
85 'webui_bookmark_editor%': 1,
81 }], 86 }],
82 ], 87 ],
83 }, 88 },
84 89
85 # Copy conditionally-set variables out one scope. 90 # Copy conditionally-set variables out one scope.
86 'chromeos%': '<(chromeos)', 91 'chromeos%': '<(chromeos)',
87 'touchui%': '<(touchui)', 92 'touchui%': '<(touchui)',
93 'webui_bookmark_editor%': '<(webui_bookmark_editor)',
88 'webui_certificate_viewer%': '<(webui_certificate_viewer)', 94 'webui_certificate_viewer%': '<(webui_certificate_viewer)',
89 'host_arch%': '<(host_arch)', 95 'host_arch%': '<(host_arch)',
90 'toolkit_views%': '<(toolkit_views)', 96 'toolkit_views%': '<(toolkit_views)',
91 'toolkit_uses_pure_views%': '<(toolkit_uses_pure_views)', 97 'toolkit_uses_pure_views%': '<(toolkit_uses_pure_views)',
92 'views_compositor%': '<(views_compositor)', 98 'views_compositor%': '<(views_compositor)',
93 # Whether to build for Wayland display server 99 # Whether to build for Wayland display server
94 'use_wayland%': 0, 100 'use_wayland%': 0,
95 101
96 # We used to provide a variable for changing how libraries were built. 102 # We used to provide a variable for changing how libraries were built.
97 # This variable remains until we can clean up all the users. 103 # This variable remains until we can clean up all the users.
(...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after
272 'views_compositor%': '<(views_compositor)', 278 'views_compositor%': '<(views_compositor)',
273 'os_posix%': '<(os_posix)', 279 'os_posix%': '<(os_posix)',
274 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)', 280 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)',
275 'use_skia%': '<(use_skia)', 281 'use_skia%': '<(use_skia)',
276 'use_x11%': '<(use_x11)', 282 'use_x11%': '<(use_x11)',
277 'use_gnome_keyring%': '<(use_gnome_keyring)', 283 'use_gnome_keyring%': '<(use_gnome_keyring)',
278 'linux_fpic%': '<(linux_fpic)', 284 'linux_fpic%': '<(linux_fpic)',
279 'enable_flapper_hacks%': '<(enable_flapper_hacks)', 285 'enable_flapper_hacks%': '<(enable_flapper_hacks)',
280 'chromeos%': '<(chromeos)', 286 'chromeos%': '<(chromeos)',
281 'touchui%': '<(touchui)', 287 'touchui%': '<(touchui)',
288 'webui_bookmark_editor%': '<(webui_bookmark_editor)',
282 'webui_certificate_viewer%': '<(webui_certificate_viewer)', 289 'webui_certificate_viewer%': '<(webui_certificate_viewer)',
283 'file_manager_extension%': '<(file_manager_extension)', 290 'file_manager_extension%': '<(file_manager_extension)',
284 'inside_chromium_build%': '<(inside_chromium_build)', 291 'inside_chromium_build%': '<(inside_chromium_build)',
285 'fastbuild%': '<(fastbuild)', 292 'fastbuild%': '<(fastbuild)',
286 'python_ver%': '<(python_ver)', 293 'python_ver%': '<(python_ver)',
287 'armv7%': '<(armv7)', 294 'armv7%': '<(armv7)',
288 'arm_neon%': '<(arm_neon)', 295 'arm_neon%': '<(arm_neon)',
289 'sysroot%': '<(sysroot)', 296 'sysroot%': '<(sysroot)',
290 'disable_sse2%': '<(disable_sse2)', 297 'disable_sse2%': '<(disable_sse2)',
291 'component%': '<(component)', 298 'component%': '<(component)',
(...skipping 334 matching lines...) Expand 10 before | Expand all | Expand 10 after
626 }], 633 }],
627 ['toolkit_views==1', { 634 ['toolkit_views==1', {
628 'grit_defines': ['-D', 'toolkit_views'], 635 'grit_defines': ['-D', 'toolkit_views'],
629 }], 636 }],
630 ['toolkit_uses_pure_views==1', { 637 ['toolkit_uses_pure_views==1', {
631 'grit_defines': ['-D', 'toolkit_uses_pure_views'], 638 'grit_defines': ['-D', 'toolkit_uses_pure_views'],
632 }], 639 }],
633 ['touchui==1', { 640 ['touchui==1', {
634 'grit_defines': ['-D', 'touchui'], 641 'grit_defines': ['-D', 'touchui'],
635 }], 642 }],
643 ['webui_bookmark_editor==1', {
644 'grit_defines': ['-D', 'webui_bookmark_editor'],
645 }],
636 ['webui_certificate_viewer==1', { 646 ['webui_certificate_viewer==1', {
637 'grit_defines': ['-D', 'webui_certificate_viewer'], 647 'grit_defines': ['-D', 'webui_certificate_viewer'],
638 }], 648 }],
639 ['file_manager_extension==1', { 649 ['file_manager_extension==1', {
640 'grit_defines': ['-D', 'file_manager_extension'], 650 'grit_defines': ['-D', 'file_manager_extension'],
641 }], 651 }],
642 ['remoting==1', { 652 ['remoting==1', {
643 'grit_defines': ['-D', 'remoting'], 653 'grit_defines': ['-D', 'remoting'],
644 }], 654 }],
645 ['use_titlecase_in_grd_files==1', { 655 ['use_titlecase_in_grd_files==1', {
(...skipping 1266 matching lines...) Expand 10 before | Expand all | Expand 10 after
1912 # settings in target dicts. SYMROOT is a special case, because many other 1922 # settings in target dicts. SYMROOT is a special case, because many other
1913 # Xcode variables depend on it, including variables such as 1923 # Xcode variables depend on it, including variables such as
1914 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 1924 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
1915 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 1925 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
1916 # files to appear (when present) in the UI as actual files and not red 1926 # files to appear (when present) in the UI as actual files and not red
1917 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 1927 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
1918 # and therefore SYMROOT, needs to be set at the project level. 1928 # and therefore SYMROOT, needs to be set at the project level.
1919 'SYMROOT': '<(DEPTH)/xcodebuild', 1929 'SYMROOT': '<(DEPTH)/xcodebuild',
1920 }, 1930 },
1921 } 1931 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698