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

Side by Side Diff: build/common.gypi

Issue 697223003: MacViews: Get chrome/browser/ui/views/frame to compile (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@constrained
Patch Set: Rebase. Add mac_views_browser build flag Created 6 years, 1 month 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
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 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 'use_aura%': '<(use_aura)', 54 'use_aura%': '<(use_aura)',
55 'use_ash%': '<(use_ash)', 55 'use_ash%': '<(use_ash)',
56 'use_cras%': '<(use_cras)', 56 'use_cras%': '<(use_cras)',
57 'use_ozone%': '<(use_ozone)', 57 'use_ozone%': '<(use_ozone)',
58 'embedded%': '<(embedded)', 58 'embedded%': '<(embedded)',
59 'host_arch%': '<(host_arch)', 59 'host_arch%': '<(host_arch)',
60 60
61 # Whether we are using Views Toolkit 61 # Whether we are using Views Toolkit
62 'toolkit_views%': 0, 62 'toolkit_views%': 0,
63 63
64 # Whether the browser is non-native (using Views Toolkit) on Mac.
65 'mac_views_browser%': 0,
tapted 2014/11/04 02:33:42 nit: since other things don't depend on it, I thin
Andre 2014/11/05 02:04:22 Done.
66
64 # Use OpenSSL instead of NSS as the underlying SSL and crypto 67 # Use OpenSSL instead of NSS as the underlying SSL and crypto
65 # implementation. Certificate verification will in most cases be 68 # implementation. Certificate verification will in most cases be
66 # handled by the OS. If OpenSSL's struct X509 is used to represent 69 # handled by the OS. If OpenSSL's struct X509 is used to represent
67 # certificates, use_openssl_certs must be set. 70 # certificates, use_openssl_certs must be set.
68 'use_openssl%': 0, 71 'use_openssl%': 0,
69 72
70 # Typedef X509Certificate::OSCertHandle to OpenSSL's struct X509*. 73 # Typedef X509Certificate::OSCertHandle to OpenSSL's struct X509*.
71 'use_openssl_certs%': 0, 74 'use_openssl_certs%': 0,
72 75
73 # Disable viewport meta tag by default. 76 # Disable viewport meta tag by default.
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after
270 }, 273 },
271 274
272 # Copy conditionally-set variables out one scope. 275 # Copy conditionally-set variables out one scope.
273 'chromeos%': '<(chromeos)', 276 'chromeos%': '<(chromeos)',
274 'chromecast%': '<(chromecast)', 277 'chromecast%': '<(chromecast)',
275 'host_arch%': '<(host_arch)', 278 'host_arch%': '<(host_arch)',
276 'target_arch%': '<(target_arch)', 279 'target_arch%': '<(target_arch)',
277 'target_subarch%': '<(target_subarch)', 280 'target_subarch%': '<(target_subarch)',
278 'mips_arch_variant%': '<(mips_arch_variant)', 281 'mips_arch_variant%': '<(mips_arch_variant)',
279 'toolkit_views%': '<(toolkit_views)', 282 'toolkit_views%': '<(toolkit_views)',
283 'mac_views_browser': '<(mac_views_browser)',
280 'desktop_linux%': '<(desktop_linux)', 284 'desktop_linux%': '<(desktop_linux)',
281 'use_aura%': '<(use_aura)', 285 'use_aura%': '<(use_aura)',
282 'use_ash%': '<(use_ash)', 286 'use_ash%': '<(use_ash)',
283 'use_cras%': '<(use_cras)', 287 'use_cras%': '<(use_cras)',
284 'use_ozone%': '<(use_ozone)', 288 'use_ozone%': '<(use_ozone)',
285 'use_ozone_evdev%': '<(use_ozone_evdev)', 289 'use_ozone_evdev%': '<(use_ozone_evdev)',
286 'use_clipboard_aurax11%': '<(use_clipboard_aurax11)', 290 'use_clipboard_aurax11%': '<(use_clipboard_aurax11)',
287 'embedded%': '<(embedded)', 291 'embedded%': '<(embedded)',
288 'use_openssl%': '<(use_openssl)', 292 'use_openssl%': '<(use_openssl)',
289 'use_openssl_certs%': '<(use_openssl_certs)', 293 'use_openssl_certs%': '<(use_openssl_certs)',
(...skipping 780 matching lines...) Expand 10 before | Expand all | Expand 10 after
1070 }, 1074 },
1071 1075
1072 # Copy conditionally-set variables out one scope. 1076 # Copy conditionally-set variables out one scope.
1073 'branding%': '<(branding)', 1077 'branding%': '<(branding)',
1074 'buildtype%': '<(buildtype)', 1078 'buildtype%': '<(buildtype)',
1075 'target_arch%': '<(target_arch)', 1079 'target_arch%': '<(target_arch)',
1076 'target_subarch%': '<(target_subarch)', 1080 'target_subarch%': '<(target_subarch)',
1077 'mips_arch_variant%': '<(mips_arch_variant)', 1081 'mips_arch_variant%': '<(mips_arch_variant)',
1078 'host_arch%': '<(host_arch)', 1082 'host_arch%': '<(host_arch)',
1079 'toolkit_views%': '<(toolkit_views)', 1083 'toolkit_views%': '<(toolkit_views)',
1084 'mac_views_browser': '<(mac_views_browser)',
1080 'ui_compositor_image_transport%': '<(ui_compositor_image_transport)', 1085 'ui_compositor_image_transport%': '<(ui_compositor_image_transport)',
1081 'use_aura%': '<(use_aura)', 1086 'use_aura%': '<(use_aura)',
1082 'use_ash%': '<(use_ash)', 1087 'use_ash%': '<(use_ash)',
1083 'use_cras%': '<(use_cras)', 1088 'use_cras%': '<(use_cras)',
1084 'use_openssl%': '<(use_openssl)', 1089 'use_openssl%': '<(use_openssl)',
1085 'use_openssl_certs%': '<(use_openssl_certs)', 1090 'use_openssl_certs%': '<(use_openssl_certs)',
1086 'use_nss%': '<(use_nss)', 1091 'use_nss%': '<(use_nss)',
1087 'use_udev%': '<(use_udev)', 1092 'use_udev%': '<(use_udev)',
1088 'os_bsd%': '<(os_bsd)', 1093 'os_bsd%': '<(os_bsd)',
1089 'os_posix%': '<(os_posix)', 1094 'os_posix%': '<(os_posix)',
(...skipping 1486 matching lines...) Expand 10 before | Expand all | Expand 10 after
2576 }], 2581 }],
2577 ['enable_rlz==1', { 2582 ['enable_rlz==1', {
2578 'defines': ['ENABLE_RLZ'], 2583 'defines': ['ENABLE_RLZ'],
2579 }], 2584 }],
2580 ['component=="shared_library"', { 2585 ['component=="shared_library"', {
2581 'defines': ['COMPONENT_BUILD'], 2586 'defines': ['COMPONENT_BUILD'],
2582 }], 2587 }],
2583 ['toolkit_views==1', { 2588 ['toolkit_views==1', {
2584 'defines': ['TOOLKIT_VIEWS=1'], 2589 'defines': ['TOOLKIT_VIEWS=1'],
2585 }], 2590 }],
2591 ['mac_views_browser==1', {
2592 'defines': ['MAC_VIEWS_BROWSER=1'],
tapted 2014/11/04 02:33:42 You might not need this with the comments below
Andre 2014/11/05 02:04:22 Deleted.
2593 }],
2586 ['ui_compositor_image_transport==1', { 2594 ['ui_compositor_image_transport==1', {
2587 'defines': ['UI_COMPOSITOR_IMAGE_TRANSPORT'], 2595 'defines': ['UI_COMPOSITOR_IMAGE_TRANSPORT'],
2588 }], 2596 }],
2589 ['use_aura==1', { 2597 ['use_aura==1', {
2590 'defines': ['USE_AURA=1'], 2598 'defines': ['USE_AURA=1'],
2591 }], 2599 }],
2592 ['use_ash==1', { 2600 ['use_ash==1', {
2593 'defines': ['USE_ASH=1'], 2601 'defines': ['USE_ASH=1'],
2594 }], 2602 }],
2595 ['use_pango==1', { 2603 ['use_pango==1', {
(...skipping 3285 matching lines...) Expand 10 before | Expand all | Expand 10 after
5881 # settings in target dicts. SYMROOT is a special case, because many other 5889 # settings in target dicts. SYMROOT is a special case, because many other
5882 # Xcode variables depend on it, including variables such as 5890 # Xcode variables depend on it, including variables such as
5883 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 5891 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
5884 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 5892 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
5885 # files to appear (when present) in the UI as actual files and not red 5893 # files to appear (when present) in the UI as actual files and not red
5886 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 5894 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
5887 # and therefore SYMROOT, needs to be set at the project level. 5895 # and therefore SYMROOT, needs to be set at the project level.
5888 'SYMROOT': '<(DEPTH)/xcodebuild', 5896 'SYMROOT': '<(DEPTH)/xcodebuild',
5889 }, 5897 },
5890 } 5898 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/cocoa/browser_window_factory.mm » ('j') | chrome/browser/ui/cocoa/browser_window_factory.mm » ('J')

Powered by Google App Engine
This is Rietveld 408576698