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

Unified Diff: build/common.gypi

Issue 23993003: linux_aura: Use the linux assets for the window caption buttons. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: I suspect rietveld is confused. Reuploading patch. Created 7 years, 3 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 | ui/resources/ui_resources.grd » ('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 61f11034675e8e6e0304be2dab8a3c9e9791a93e..15dee473b1cfa2abb17feee4d5b282fd765e0c0d 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -143,6 +143,13 @@
'toolkit_uses_gtk%': 0,
}],
+ # Whether we're a traditional desktop unix.
+ ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris") and chromeos==0', {
+ 'desktop_linux%': 1,
+ }, {
+ 'desktop_linux%': 0,
+ }],
+
# Enable HiDPI on Mac OS and Chrome OS.
['OS=="mac" or chromeos==1', {
'enable_hidpi%': 1,
@@ -174,6 +181,7 @@
'target_arch%': '<(target_arch)',
'toolkit_views%': '<(toolkit_views)',
'toolkit_uses_gtk%': '<(toolkit_uses_gtk)',
+ 'desktop_linux%': '<(desktop_linux)',
'use_aura%': '<(use_aura)',
'use_ash%': '<(use_ash)',
'use_cras%': '<(use_cras)',
@@ -791,6 +799,7 @@
'use_pango%': '<(use_pango)',
'use_ozone%': '<(use_ozone)',
'toolkit_uses_gtk%': '<(toolkit_uses_gtk)',
+ 'desktop_linux%': '<(desktop_linux)',
'use_x11%': '<(use_x11)',
'use_gnome_keyring%': '<(use_gnome_keyring)',
'linux_fpic%': '<(linux_fpic)',
@@ -1532,6 +1541,9 @@
['chromeos==1', {
'grit_defines': ['-D', 'chromeos', '-D', 'scale_factors=2x'],
}],
+ ['desktop_linux==1', {
+ 'grit_defines': ['-D', 'desktop_linux'],
+ }],
['toolkit_views==1', {
'grit_defines': ['-D', 'toolkit_views'],
}],
« no previous file with comments | « no previous file | ui/resources/ui_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698