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

Unified Diff: build/common.gypi

Issue 7780012: First step into enabling pure views build for Chromium/ChromiumOS (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: missing comma in comment 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
« no previous file with comments | « no previous file | views/widget/widget.cc » ('j') | views/widget/widget.cc » ('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 a64ab3758b89dce365e87ec33c771897d1100b83..d17f50f764e6a6cc93743410b1568d48563f59b8 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -25,11 +25,7 @@
# or if it must only use GTK (the default at the moment).
# This is an intermediate step until all of Views is 'Pure',
# at which point we plan to remove those switches.
- # This turns on the TOOLKIT_USES_PURE_VIEWS macro which is used
- # to replace the corresponding GTK implementation in such a way
- # that GTK and PureViews can coexist. This intermediate solution
- # allow us to switch the view implementations using
- # --use-pure-views, without breaking exiting gtk implementation.
+ # This turns on the TOOLKIT_USES_PURE_VIEWS macro.
'toolkit_uses_pure_views%': 0,
# Disable touch support by default.
@@ -66,26 +62,26 @@
'<!(uname -m | sed -e "s/i.86/ia32/;s/x86_64/x64/;s/amd64/x64/;s/arm.*/arm/;s/i86pc/ia32/")',
}],
- # Set default value of toolkit_views on for Windows, Chrome OS
- # and the touch UI.
+ # Set default value of toolkit_views on for Windows, Chrome OS,
+ # Touch and PureView.
['OS=="win" or chromeos==1 or touchui==1 or toolkit_uses_pure_views==1', {
'toolkit_views%': 1,
}, {
'toolkit_views%': 0,
}],
- # Views are always Pure in Touch case
+ # Views are always Pure in Touch case.
['touchui==1', {
'toolkit_uses_pure_views%': 1,
}, {
'toolkit_uses_pure_views%': 0,
}],
- # Use WebUI dialogs in TouchUI builds.
- ['touchui==1', {
+ # Use WebUI dialogs in TouchUI and PureView builds.
+ ['touchui==1 or toolkit_uses_pure_views==1', {
'webui_dialogs%': 1,
oshima 2011/09/10 02:04:19 just a q: do you know when we'll make this a flag?
Emmanuel Saint-loubert-Bié 2011/09/10 03:06:31 I assume when rbyers / flackr are further along?
}],
-
+
# Use the views compositor when using the Aura window manager.
['use_aura==1', {
'views_compositor%': 1,
@@ -269,9 +265,9 @@
}, {
'file_manager_extension%': 0,
}],
-
- # Enable WebUI TaskManager only on Chrome OS and Touch UI.
- ['chromeos==1 or touchui==1', {
+
+ # Enable WebUI TaskManager only on Chrome OS, Touch or PureView.
+ ['chromeos==1 or touchui==1 or toolkit_uses_pure_views==1', {
'webui_task_manager%': 1,
}, {
'webui_task_manager%': 0,
« no previous file with comments | « no previous file | views/widget/widget.cc » ('j') | views/widget/widget.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698