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

Unified Diff: build/common.gypi

Issue 11419094: Adds use_default_render_theme to common.gypi so that features.gypi can (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: os_poxis -> !win Created 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | 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 deadc29b31bdaf90f129840cf9f3e32374019e07..0a1727e58130df7ac03a3e97e95d33c2cded6d3d 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -141,6 +141,13 @@
}, {
'enable_app_list%': 0,
}],
+
+ ['use_aura==1 or (OS!="win" and OS!="mac" and OS!="ios" and OS!="android")', {
+ # TODO(sky): make this 1 when corresponding webkit pieces land.
+ 'use_default_render_theme%': 0,
+ }, {
+ 'use_default_render_theme%': 0,
+ }],
],
},
@@ -159,6 +166,7 @@
'android_upstream_bringup%': '<(android_upstream_bringup)',
'android_build_type%': '<(android_build_type)',
'enable_app_list%': '<(enable_app_list)',
+ 'use_default_render_theme%': '<(use_default_render_theme)',
# We used to provide a variable for changing how libraries were built.
# This variable remains until we can clean up all the users.
@@ -685,6 +693,7 @@
'use_system_libjpeg%': '<(use_system_libjpeg)',
'android_build_type%': '<(android_build_type)',
'enable_app_list%': '<(enable_app_list)',
+ 'use_default_render_theme%': '<(use_default_render_theme)',
'enable_settings_app%': '<(enable_settings_app)',
'use_official_google_api_keys%': '<(use_official_google_api_keys)',
'google_api_key%': '<(google_api_key)',
@@ -1594,6 +1603,9 @@
['use_ash==1', {
'defines': ['USE_ASH=1'],
}],
+ ['use_default_render_theme==1', {
+ 'defines': ['USE_DEFAULT_RENDER_THEME=1'],
+ }],
['use_libjpeg_turbo==1', {
'defines': ['USE_LIBJPEG_TURBO=1'],
}],
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698