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

chrome/chrome_browser.gypi

Index: chrome/chrome_browser.gypi
===================================================================
--- chrome/chrome_browser.gypi	(revision 101787)
+++ chrome/chrome_browser.gypi	(working copy)
@@ -2822,6 +2822,7 @@
         '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',
@@ -4115,9 +4116,14 @@
             '../ui/aura/aura.gyp:aura',
           ],
         }],
-        # Exclude WebUI certificate viewer if not POSIX or mac (these OS's have
-        # native certificate viewers).
-        ['os_posix == 0 or OS == "mac"', {
+        ['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"', {
           'sources/': [
             ['exclude', '^browser/ui/webui/certificate_viewer.cc'],
             ['exclude', '^browser/ui/webui/certificate_viewer.h'],
@@ -4125,6 +4131,23 @@
             ['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',
@@ -4449,6 +4472,7 @@
                 ['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'],
@@ -4761,6 +4785,15 @@
                 ['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', {
Property changes on: chrome/chrome_browser.gypi
___________________________________________________________________
Added: svn:mergeinfo