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

Unified Diff: build/common.gypi

Issue 7670041: Add --use-more-webui runtime flag to toggle WebUI replacements for native dialogs. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Merge with trunk and fix hung renderer dialog close. 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 a64ab3758b89dce365e87ec33c771897d1100b83..bebf07cfa275fc961a08321c894716d3c4b82f27 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -35,11 +35,6 @@
# Disable touch support by default.
'touchui%': 0,
- # Disable webui dialog replacements for native dialogs by default.
- # TODO(flackr): Change this to a runtime flag triggered by
- # --pure-views so that these dialogs can be easily tested.
- 'webui_dialogs%': 0,
-
# Whether the compositor is enabled on views.
'views_compositor%': 0,
@@ -50,7 +45,6 @@
'chromeos%': '<(chromeos)',
'toolkit_uses_pure_views%': '<(toolkit_uses_pure_views)',
'touchui%': '<(touchui)',
- 'webui_dialogs%': '<(webui_dialogs)',
'views_compositor%': '<(views_compositor)',
'use_aura%': '<(use_aura)',
@@ -81,11 +75,6 @@
'toolkit_uses_pure_views%': 0,
}],
- # Use WebUI dialogs in TouchUI builds.
- ['touchui==1', {
- 'webui_dialogs%': 1,
- }],
-
# Use the views compositor when using the Aura window manager.
['use_aura==1', {
'views_compositor%': 1,
@@ -96,7 +85,6 @@
# Copy conditionally-set variables out one scope.
'chromeos%': '<(chromeos)',
'touchui%': '<(touchui)',
- 'webui_dialogs%': '<(webui_dialogs)',
'host_arch%': '<(host_arch)',
'toolkit_views%': '<(toolkit_views)',
'toolkit_uses_pure_views%': '<(toolkit_uses_pure_views)',
@@ -305,7 +293,6 @@
'enable_flapper_hacks%': '<(enable_flapper_hacks)',
'chromeos%': '<(chromeos)',
'touchui%': '<(touchui)',
- 'webui_dialogs%': '<(webui_dialogs)',
'file_manager_extension%': '<(file_manager_extension)',
'webui_task_manager%': '<(webui_task_manager)',
'inside_chromium_build%': '<(inside_chromium_build)',
@@ -678,9 +665,6 @@
['touchui==1', {
'grit_defines': ['-D', 'touchui'],
}],
- ['webui_dialogs==1', {
- 'grit_defines': ['-D', 'webui_dialogs'],
- }],
['file_manager_extension==1', {
'grit_defines': ['-D', 'file_manager_extension'],
}],

Powered by Google App Engine
This is Rietveld 408576698