Revert 101581 - Add --use-more-webui runtime flag to toggle WebUI replacements for native dialogs.

build/common.gypi

Index: build/common.gypi
===================================================================
--- build/common.gypi	(revision 101584)
+++ build/common.gypi	(working copy)
@@ -31,6 +31,11 @@
           # 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,
 
@@ -41,6 +46,7 @@
         'chromeos%': '<(chromeos)',
         'use_only_pure_views%': '<(use_only_pure_views)',
         'touchui%': '<(touchui)',
+        'webui_dialogs%': '<(webui_dialogs)',
         'views_compositor%': '<(views_compositor)',
         'use_aura%': '<(use_aura)',
 
@@ -71,6 +77,11 @@
             'use_only_pure_views%': 0,
           }],
 
+          # Use WebUI dialogs in TouchUI and PureView builds.
+          ['touchui==1 or use_only_pure_views==1', {
+            'webui_dialogs%': 1,
+          }],
+
           # Use the views compositor when using the Aura window manager.
           ['use_aura==1', {
             'views_compositor%': 1,
@@ -81,6 +92,7 @@
       # 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)',
@@ -293,6 +305,7 @@
     '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)',
@@ -655,6 +668,9 @@
       ['touchui==1', {
         'grit_defines': ['-D', 'touchui'],
       }],
+      ['webui_dialogs==1', {
+        'grit_defines': ['-D', 'webui_dialogs'],
+      }],
       ['file_manager_extension==1', {
         'grit_defines': ['-D', 'file_manager_extension'],
       }],