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

Unified Diff: build/common.gypi

Issue 7850026: Aura under Linux (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: White spaces Created 9 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
Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index f5b5bc1bf0d2cce1a4ce5692f097b7d4059e7b0b..f060eb5c25e32dc9f32ffb5296a27580523712bf 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -21,6 +21,9 @@
# Whether we're building a ChromeOS build.
'chromeos%': 0,
+ # Whether we are using Views Toolkit
+ 'toolkit_views%': 0,
+
# Whether the Views toolkit can use its Pure form when available
# or if it must only use GTK (the default at the moment).
# This is an intermediate step until all of Views is 'Pure',
@@ -64,21 +67,21 @@
# Set default value of toolkit_views on for Windows, Chrome OS,
# Touch and PureView.
- ['OS=="win" or chromeos==1 or touchui==1 or use_only_pure_views==1', {
+ ['OS=="win" or chromeos==1 or touchui==1 or use_only_pure_views==1 or use_aura==1', {
'toolkit_views%': 1,
}, {
'toolkit_views%': 0,
}],
- # Views are always Pure in Touch case.
- ['touchui==1', {
+ # Views are always Pure in Touch and Aura case.
+ ['touchui==1 or use_aura==1', {
'use_only_pure_views%': 1,
}, {
'use_only_pure_views%': 0,
}],
# Use WebUI dialogs in TouchUI and PureView builds.
- ['touchui==1 or use_only_pure_views==1', {
+ ['touchui==1 or use_only_pure_views==1 or use_aura==1', {
'webui_dialogs%': 1,
}],
@@ -271,7 +274,7 @@
}],
# Enable WebUI TaskManager only on Chrome OS, Touch or PureView.
- ['chromeos==1 or touchui==1 or use_only_pure_views==1', {
+ ['chromeos==1 or touchui==1 or use_only_pure_views==1 or use_aura==1', {
'webui_task_manager%': 1,
}, {
'webui_task_manager%': 0,
« no previous file with comments | « no previous file | chrome/browser/automation/ui_controls_linux.cc » ('j') | chrome/browser/chromeos/frame/bubble_window_views.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698