diff options
| author | flackr@chromium.org <flackr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-21 02:03:38 +0000 |
|---|---|---|
| committer | flackr@chromium.org <flackr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-21 02:03:38 +0000 |
| commit | 8befa1ae97817eac7df577a708c539dec9202f70 (patch) | |
| tree | 01200b40051a64b43279d00315c3719185910a98 /build | |
| parent | ce975194840cf5c18f5a87fcd98267fb241f16dc (diff) | |
| download | chromium_src-8befa1ae97817eac7df577a708c539dec9202f70.zip chromium_src-8befa1ae97817eac7df577a708c539dec9202f70.tar.gz chromium_src-8befa1ae97817eac7df577a708c539dec9202f70.tar.bz2 | |
Add --use-more-webui runtime flag to toggle WebUI replacements for native dialogs (Patch set 1 Reverts revert of http://codereview.chromium.org/7670041/)
This adds the flag --use-more-webui to allow turning on WebUI replacements for native dialogs. This flag is automatically set when --use-pure-views is specified. Modifies replaced native dialogs to be toggled based on flag value. BookmarkEditor has also been refactored to use static constructors to EditDetails to describe what is being edited to make the code more readable.
BUG=96935
TEST=Tested that webui dialogs can be turned on or left off with --use-more-webui.
Review URL: http://codereview.chromium.org/7957002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102071 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/build/common.gypi b/build/common.gypi index 33763c1..196996b 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -34,11 +34,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, @@ -49,7 +44,6 @@ 'chromeos%': '<(chromeos)', 'use_only_pure_views%': '<(use_only_pure_views)', 'touchui%': '<(touchui)', - 'webui_dialogs%': '<(webui_dialogs)', 'views_compositor%': '<(views_compositor)', 'use_aura%': '<(use_aura)', @@ -80,11 +74,6 @@ 'use_only_pure_views%': 0, }], - # Use WebUI dialogs in TouchUI and PureView builds. - ['touchui==1 or use_only_pure_views==1 or use_aura==1', { - 'webui_dialogs%': 1, - }], - # Use the views compositor when using the Aura window manager. ['use_aura==1', { 'views_compositor%': 1, @@ -95,7 +84,6 @@ # Copy conditionally-set variables out one scope. 'chromeos%': '<(chromeos)', 'touchui%': '<(touchui)', - 'webui_dialogs%': '<(webui_dialogs)', 'host_arch%': '<(host_arch)', 'toolkit_views%': '<(toolkit_views)', 'use_only_pure_views%': '<(use_only_pure_views)', @@ -322,7 +310,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)', @@ -754,9 +741,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'], }], |