diff options
Diffstat (limited to 'chrome/chrome_browser.gypi')
| -rw-r--r-- | chrome/chrome_browser.gypi | 39 |
1 files changed, 3 insertions, 36 deletions
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index 9d85137..f48f291 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -2822,7 +2822,6 @@ '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', @@ -4116,14 +4115,9 @@ '../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'], @@ -4131,23 +4125,6 @@ ['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', @@ -4472,7 +4449,6 @@ ['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'], @@ -4785,15 +4761,6 @@ ['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', { |