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

build/common.gypi

 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # IMPORTANT:
 # Please don't directly include this file if you are building via gyp_chromium,
 # since gyp_chromium is automatically forcing its inclusion.
 {
   # Variables expected to be overriden on the GYP command line (-D) or by
   # ~/.gyp/include.gypi.
@@ skipping 13 matching lines @@
           # 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',
           # at which point we plan to remove those switches.
           # This turns on the USE_ONLY_PURE_VIEWS macro.
           'use_only_pure_views%': 0,
 
           # 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,
 
           # Whether or not we are building with the Aura window manager.
           'use_aura%': 0,
         },
         # Copy conditionally-set variables out one scope.
         'chromeos%': '<(chromeos)',
         'use_only_pure_views%': '<(use_only_pure_views)',
         'touchui%': '<(touchui)',
+        'webui_dialogs%': '<(webui_dialogs)',
         'views_compositor%': '<(views_compositor)',
         'use_aura%': '<(use_aura)',
 
         # Compute the architecture that we're building on.
         'conditions': [
           [ 'OS=="win" or OS=="mac"', {
             'host_arch%': 'ia32',
           }, {
             # This handles the Unix platforms for which there is some support.
             # Anything else gets passed through, which probably won't work very
@@ skipping 10 matching lines @@
             'toolkit_views%': 0,
           }],
 
           # Views are always Pure in Touch case.
           ['touchui==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', {
+            'webui_dialogs%': 1,
+          }],
+
           # Use the views compositor when using the Aura window manager.
           ['use_aura==1', {
             'views_compositor%': 1,
           }],
         ],
       },
 
       # 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)',
       'views_compositor%': '<(views_compositor)',
       'use_aura%': '<(use_aura)',
 
       # We used to provide a variable for changing how libraries were built.
       # This variable remains until we can clean up all the users.
       # This needs to be one nested variables dict in so that dependent
       # gyp files can make use of it in their outer variables.  (Yikes!)
@@ skipping 192 matching lines @@
     'use_aura%': '<(use_aura)',
     'os_posix%': '<(os_posix)',
     'toolkit_uses_gtk%': '<(toolkit_uses_gtk)',
     'use_skia%': '<(use_skia)',
     'use_x11%': '<(use_x11)',
     'use_gnome_keyring%': '<(use_gnome_keyring)',
     'linux_fpic%': '<(linux_fpic)',
     '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)',
     'fastbuild%': '<(fastbuild)',
     'python_ver%': '<(python_ver)',
     'armv7%': '<(armv7)',
     'arm_neon%': '<(arm_neon)',
     'sysroot%': '<(sysroot)',
     'disable_sse2%': '<(disable_sse2)',
     'component%': '<(component)',
@@ skipping 342 matching lines @@
       }],
       ['use_only_pure_views==1', {
         'grit_defines': ['-D', 'use_only_pure_views'],
       }],
       ['use_aura==1', {
         'grit_defines': ['-D', 'use_aura'],
       }],
       ['touchui==1', {
         'grit_defines': ['-D', 'touchui'],
       }],
+      ['webui_dialogs==1', {
+        'grit_defines': ['-D', 'webui_dialogs'],
+      }],
       ['file_manager_extension==1', {
         'grit_defines': ['-D', 'file_manager_extension'],
       }],
       ['webui_task_manager==1', {
         'grit_defines': ['-D', 'webui_task_manager'],
       }],
       ['remoting==1', {
         'grit_defines': ['-D', 'remoting'],
       }],
       ['use_titlecase_in_grd_files==1', {
@@ skipping 1368 matching lines @@
     # settings in target dicts.  SYMROOT is a special case, because many other
     # Xcode variables depend on it, including variables such as
     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something
     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
     # files to appear (when present) in the UI as actual files and not red
     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
     # and therefore SYMROOT, needs to be set at the project level.
     'SYMROOT': '<(DEPTH)/xcodebuild',
   },
 }