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

Unified Diff: build/common.gypi

Issue 10024050: Metro/HiDPI: Move 1x icons into separate pak file (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix clobber build Created 8 years, 8 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 | chrome/chrome_dll.gypi » ('j') | ui/base/resource/resource_bundle_mac.mm » ('J')
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 659b45d196d5151a9727d4f96fca1d88eeea8281..26590c540a28184a414d3ff1eb6214bf237c9123 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -40,6 +40,9 @@
# Disable viewport meta tag by default.
'enable_viewport%': 0,
+
+ # Enable HiDPI support.
+ 'enable_hidpi%': 0,
Nico 2012/04/23 15:51:25 Do you need to put this in the innermost variables
},
# Copy conditionally-set variables out one scope.
'chromeos%': '<(chromeos)',
@@ -49,6 +52,7 @@
'use_openssl%': '<(use_openssl)',
'use_virtual_keyboard%': '<(use_virtual_keyboard)',
'enable_viewport%': '<(enable_viewport)',
+ 'enable_hidpi%': '<(enable_hidpi)',
# Compute the architecture that we're building on.
'conditions': [
@@ -82,6 +86,11 @@
}, {
'toolkit_views%': 0,
}],
+
+ # Enable HiDPI on Mac OS.
+ ['OS=="mac"', {
+ 'enable_hidpi%': 1,
+ }],
],
},
@@ -95,6 +104,7 @@
'use_openssl%': '<(use_openssl)',
'use_virtual_keyboard%': '<(use_virtual_keyboard)',
'enable_viewport%': '<(enable_viewport)',
+ 'enable_hidpi%': '<(enable_hidpi)',
# We used to provide a variable for changing how libraries were built.
# This variable remains until we can clean up all the users.
@@ -487,6 +497,7 @@
'chromeos%': '<(chromeos)',
'use_virtual_keyboard%': '<(use_virtual_keyboard)',
'enable_viewport%': '<(enable_viewport)',
+ 'enable_hidpi%': '<(enable_hidpi)',
'use_xi2_mt%':'<(use_xi2_mt)',
'file_manager_extension%': '<(file_manager_extension)',
'webui_task_manager%': '<(webui_task_manager)',
@@ -1277,6 +1288,9 @@
['notifications==1', {
'defines': ['ENABLE_NOTIFICATIONS'],
}],
+ ['enable_hidpi==1', {
+ 'defines': ['ENABLE_HIDPI=1'],
+ }],
['fastbuild!=0', {
'conditions': [
« no previous file with comments | « no previous file | chrome/chrome_dll.gypi » ('j') | ui/base/resource/resource_bundle_mac.mm » ('J')

Powered by Google App Engine
This is Rietveld 408576698