Chromium Code Reviews| Index: build/common.gypi |
| diff --git a/build/common.gypi b/build/common.gypi |
| index b39947df0d584ede63f9cacf72e2a8e3cd083714..5c3ccfabc32986cb0849ea15c71b02bc898c5d86 100644 |
| --- a/build/common.gypi |
| +++ b/build/common.gypi |
| @@ -650,6 +650,9 @@ |
| # See http://clang.llvm.org/docs/ControlFlowIntegrity.html |
| 'cfi_vptr%': 0, |
| + # Whether the browser is non-native (using Views Toolkit) on Mac. |
|
tapted
2015/03/12 18:16:46
nit: I wouldn't say "non-native", I would just say
Andre
2015/03/12 21:16:41
Done.
|
| + 'mac_views_browser%': 0, |
| + |
| 'conditions': [ |
| # A flag for POSIX platforms |
| ['OS=="win"', { |
| @@ -1225,6 +1228,7 @@ |
| 'support_pre_M6_history_database%': '<(support_pre_M6_history_database)', |
| 'v8_use_external_startup_data%': '<(v8_use_external_startup_data)', |
| 'cfi_vptr%': '<(cfi_vptr)', |
| + 'mac_views_browser%': '<(mac_views_browser)', |
| # Use system protobuf instead of bundled one. |
| 'use_system_protobuf%': 0, |
| @@ -1513,9 +1517,6 @@ |
| 'ozone_platform_ozonex%': 0, |
| 'ozone_platform_test%': 0, |
| - # Whether the browser is non-native (using Views Toolkit) on Mac. |
| - 'mac_views_browser%': 0, |
| - |
| # Experiment: http://crbug.com/426914 |
| 'envoy%': 0, |
| @@ -2160,6 +2161,9 @@ |
| ['enable_wifi_bootstrapping==1', { |
| 'grit_defines': ['-D', 'enable_wifi_bootstrapping'], |
| }], |
| + ['mac_views_browser==1', { |
| + 'grit_defines': ['-D', 'mac_views_browser'], |
| + }], |
| ['enable_resource_whitelist_generation==1 and OS!="win"', { |
| 'grit_rc_header_format': ['-h', '#define {textual_id} _Pragma("whitelisted_resource_{numeric_id}") {numeric_id}'], |
| }], |