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

Unified Diff: build/common.gypi

Issue 983823004: MacViews: Fix missing browser assets (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@titlebar
Patch Set: Undo patchset 5 Created 5 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | build/config/ui.gni » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 61224bae88ffe1dafe7907399e7d978251167c52..ec964c447d4a3474085512b3e7ffc58318fde60f 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -647,6 +647,9 @@
# See http://clang.llvm.org/docs/ControlFlowIntegrity.html
'cfi_vptr%': 0,
+ # Whether the entire browser uses toolkit-views on Mac instead of Cocoa.
+ 'mac_views_browser%': 0,
+
'conditions': [
# A flag for POSIX platforms
['OS=="win"', {
@@ -1214,6 +1217,7 @@
'video_hole%': '<(video_hole)',
'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,
@@ -1503,9 +1507,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,
@@ -2155,6 +2156,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}'],
}],
« no previous file with comments | « no previous file | build/config/ui.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698