Reland add --use-more-webui runtime flag to toggle WebUI replacements for native dialogs.

chrome/chrome_browser.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.
 
 {
   'targets': [
     {
       'target_name': 'browser',
       'type': 'static_library',
       'dependencies': [
@@ skipping 2802 matching lines @@
         'browser/ui/gtk/browser_window_gtk.h',
         'browser/ui/gtk/bubble/bubble_accelerators_gtk.cc',
         'browser/ui/gtk/bubble/bubble_accelerators_gtk.h',
         'browser/ui/gtk/bubble/bubble_gtk.cc',
         'browser/ui/gtk/bubble/bubble_gtk.h',
         'browser/ui/gtk/cairo_cached_surface.cc',
         'browser/ui/gtk/cairo_cached_surface.h',
         'browser/ui/gtk/certificate_dialogs.cc',
         'browser/ui/gtk/certificate_dialogs.h',
         'browser/ui/gtk/certificate_viewer.cc',
-        'browser/ui/gtk/certificate_viewer.h',
         'browser/ui/gtk/chrome_gtk_frame.cc',
         'browser/ui/gtk/chrome_gtk_frame.h',
         'browser/ui/gtk/collected_cookies_gtk.cc',
         'browser/ui/gtk/collected_cookies_gtk.h',
         'browser/ui/gtk/constrained_html_delegate_gtk.cc',
         'browser/ui/gtk/constrained_window_gtk.cc',
         'browser/ui/gtk/constrained_window_gtk.h',
         'browser/ui/gtk/content_setting_bubble_gtk.cc',
         'browser/ui/gtk/content_setting_bubble_gtk.h',
         'browser/ui/gtk/create_application_shortcuts_dialog_gtk.cc',
@@ skipping 1265 matching lines @@
             ['exclude', '^browser/ui/views/task_manager_view.h'],
             ['exclude', '^browser/ui/views/user_data_dir_dialog.cc'],
             ['exclude', '^browser/ui/window_snapshot/window_snapshot_win.cc'],
             ['include', '^browser/ui/views/simple_message_box_views.cc'],
             ['include', '^browser/ui/views/simple_message_box_views.h'],
           ],
           'dependencies': [
             '../ui/aura/aura.gyp:aura',
           ],
         }],
-        ['webui_dialogs == 1', {
-          'defines': [
-            'WEBUI_DIALOGS',
-          ],
-        }],
-        # Exclude WebUI certificate viewer if not POSIX, mac (these OS's have
-        # native certificate viewers) or WebUI dialogs are disabled.
-        ['webui_dialogs == 0 or os_posix == 0 or OS == "mac"', {
+        # Exclude WebUI certificate viewer if not POSIX or mac (these OS's have
+        # native certificate viewers).
+        ['os_posix == 0 or OS == "mac"', {
           'sources/': [
             ['exclude', '^browser/ui/webui/certificate_viewer.cc'],
             ['exclude', '^browser/ui/webui/certificate_viewer.h'],
             ['exclude', '^browser/ui/webui/certificate_viewer_ui.cc'],
             ['exclude', '^browser/ui/webui/certificate_viewer_ui.h'],
           ],
         }],
-        # Exclude other WebUI dialogs if WebUI dialogs are disabled.
-        ['webui_dialogs == 0', {
-          'sources/': [
-            ['exclude', '^browser/ui/webui/hung_renderer_dialog.cc'],
-            ['exclude', '^browser/ui/webui/hung_renderer_dialog.h'],
-            ['exclude', '^browser/ui/webui/hung_renderer_dialog_ui.cc'],
-            ['exclude', '^browser/ui/webui/hung_renderer_dialog_ui.h'],
-          ],
-        }],
-        ['webui_dialogs == 1', {
-          'sources/': [
-            ['exclude', '^browser/ui/gtk/certificate_viewer.cc'],
-            ['exclude', '^browser/ui/gtk/certificate_viewer.h'],
-            ['exclude', '^browser/ui/gtk/hung_renderer_dialog_gtk.cc'],
-            ['exclude', '^browser/ui/gtk/hung_renderer_dialog_gtk.h'],
-          ],
-        }],
         ['toolkit_uses_gtk == 1', {
           'dependencies': [
             '../build/linux/system.gyp:dbus',
             '../build/linux/system.gyp:gconf',
             '../build/linux/system.gyp:gtk',
             '../build/linux/system.gyp:gtkprint',
             '../build/linux/system.gyp:ssl',
             '../build/linux/system.gyp:x11',
             '../dbus/dbus.gyp:dbus',
             '../third_party/undoview/undoview.gyp:undoview',
@@ skipping 304 matching lines @@
                 ['include', '^browser/ui/gtk/bookmarks/bookmark_editor_gtk.h'],
                 ['include', '^browser/ui/gtk/bookmarks/bookmark_tree_model.cc'],
                 ['include', '^browser/ui/gtk/bookmarks/bookmark_tree_model.h'],
                 ['include', '^browser/ui/gtk/bookmarks/bookmark_utils_gtk.cc'],
                 ['include', '^browser/ui/gtk/bookmarks/bookmark_utils_gtk.h'],
                 ['include', '^browser/ui/gtk/cairo_cached_surface.cc'],
                 ['include', '^browser/ui/gtk/cairo_cached_surface.h'],
                 ['include', '^browser/ui/gtk/certificate_dialogs.cc'],
                 ['include', '^browser/ui/gtk/certificate_dialogs.h'],
                 ['include', '^browser/ui/gtk/certificate_viewer.cc'],
-                ['include', '^browser/ui/gtk/certificate_viewer.h'],
                 ['include', '^browser/ui/gtk/chrome_gtk_frame.cc'],
                 ['include', '^browser/ui/gtk/chrome_gtk_frame.h'],
                 ['include', '^browser/ui/gtk/collected_cookies_gtk.cc'],
                 ['include', '^browser/ui/gtk/collected_cookies_gtk.h'],
                 ['include', '^browser/ui/gtk/constrained_window_gtk.cc'],
                 ['include', '^browser/ui/gtk/constrained_window_gtk.h'],
                 ['include', '^browser/ui/gtk/crypto_module_password_dialog.cc'],
                 ['include', '^browser/ui/gtk/download/download_started_animation_gtk.cc'],
                 ['include', '^browser/ui/gtk/edit_search_engine_dialog.cc'],
                 ['include', '^browser/ui/gtk/edit_search_engine_dialog.h'],
@@ skipping 292 matching lines @@
                 ['exclude', '^browser/tab_contents/tab_contents_view_gtk.cc'],
                 ['exclude', '^browser/tab_contents/tab_contents_view_gtk.h'],
                 ['exclude', '^browser/ui/browser_list_gtk.cc'],
                 ['exclude', '^browser/ui/gtk/omnibox/omnibox_popup_view_gtk.cc'],
                 ['exclude', '^browser/ui/gtk/omnibox/omnibox_popup_view_gtk.h'],
                 ['exclude', '^browser/ui/panels/panel_browser_window_gtk.cc'],
                 ['exclude', '^browser/ui/panels/panel_browser_window_gtk.h'],
                 ['exclude', '^browser/ui/panels/panel_mouse_watcher_gtk.cc'],
               ],
             }],
-            # Exclude the GTK versions of dialogs if webui_dialogs are enabled.
-            ['webui_dialogs==1', {
-              'sources/': [
-                ['exclude', '^browser/ui/gtk/certificate_viewer.cc'],
-                ['exclude', '^browser/ui/gtk/certificate_viewer.h'],
-                ['exclude', '^browser/ui/gtk/hung_renderer_dialog_gtk.cc'],
-                ['exclude', '^browser/ui/gtk/hung_renderer_dialog_gtk.cc.h'],
-              ],
-            }],
             # Exclude these toolkit_views specific files again.
             # (Required because of the '^browser/extensions/' include above)
             ['toolkit_views==0', {
               'sources/': [
                 ['exclude', '^browser/extensions/extension_input_api.cc'],
                 ['exclude', '^browser/extensions/extension_input_api.h'],
                 ['exclude', '^browser/extensions/key_identifier_conversion_views.cc'],
                 ['exclude', '^browser/extensions/key_identifier_conversion_views.h'],
               ],
             }],
@@ skipping 337 matching lines @@
               # weak imports in dependents, who still must #include
               # closure_blocks_leopard_compat.h to get weak imports.
               'type': 'none',
             }],
           ],
         },
       ],
     }],
   ],
 }