| Index: chrome/chrome_browser_ui.gypi
|
| diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi
|
| index c4240ca34dcc3203db6d23e8eff25978fe6ef204..26a7d6c74c942438dfe475c2d2c0ab27fe23b092 100644
|
| --- a/chrome/chrome_browser_ui.gypi
|
| +++ b/chrome/chrome_browser_ui.gypi
|
| @@ -71,8 +71,7 @@
|
| 'browser/ui/app_list/app_list_util.cc',
|
| 'browser/ui/app_list/app_list_util.h',
|
| # All other browser/ui/app_list files go in chrome_browser_ui_app_list_sources.
|
| - 'browser/ui/app_modal_dialogs/javascript_dialog_manager.cc',
|
| - 'browser/ui/app_modal_dialogs/javascript_dialog_manager.h',
|
| + 'browser/ui/app_modal_dialogs/chrome_javascript_native_dialog_factory.h',
|
| 'browser/ui/autofill/autofill_dialog_controller.cc',
|
| 'browser/ui/autofill/autofill_dialog_controller.h',
|
| 'browser/ui/autofill/autofill_dialog_models.cc',
|
| @@ -1927,6 +1926,7 @@
|
| 'browser/ui/views/certificate_viewer_win.cc',
|
| 'browser/ui/views/chrome_constrained_window_views_client.cc',
|
| 'browser/ui/views/chrome_constrained_window_views_client.h',
|
| + 'browser/ui/views/chrome_javascript_native_dialog_factory_views.cc',
|
| 'browser/ui/views/chrome_views_delegate_chromeos.cc',
|
| 'browser/ui/views/chrome_web_dialog_view.cc',
|
| 'browser/ui/views/collected_cookies_views.cc',
|
| @@ -2079,8 +2079,6 @@
|
| 'browser/ui/views/infobars/infobar_container_view.h',
|
| 'browser/ui/views/infobars/infobar_view.cc',
|
| 'browser/ui/views/infobars/infobar_view.h',
|
| - 'browser/ui/views/javascript_app_modal_dialog_views.cc',
|
| - 'browser/ui/views/javascript_app_modal_dialog_views.h',
|
| 'browser/ui/views/load_complete_listener.cc',
|
| 'browser/ui/views/load_complete_listener.h',
|
| 'browser/ui/views/location_bar/bubble_icon_view.cc',
|
| @@ -2494,7 +2492,7 @@
|
| 'browser/ui/webui/certificate_viewer_webui.cc',
|
| 'browser/ui/webui/certificate_viewer_webui.h',
|
| ],
|
| - # Desktop Linux. Assume aura/ash/views.
|
| + # Desktop Linux. Assume aura/ash/views/x11.
|
| 'chrome_browser_ui_desktop_linux_sources': [
|
| 'browser/ui/views/app_list/linux/app_list_linux.cc',
|
| 'browser/ui/views/app_list/linux/app_list_linux.h',
|
| @@ -2507,6 +2505,8 @@
|
| 'browser/ui/views/frame/browser_desktop_window_tree_host_x11.h',
|
| 'browser/ui/views/frame/native_browser_frame_factory_auralinux.cc',
|
| 'browser/ui/views/frame/native_browser_frame_factory_desktop_ash.cc',
|
| + 'browser/ui/views/javascript_app_modal_dialog_views_x11.cc',
|
| + 'browser/ui/views/javascript_app_modal_dialog_views_x11.h',
|
| 'browser/ui/views/status_icons/status_icon_linux_wrapper.cc',
|
| 'browser/ui/views/status_icons/status_icon_linux_wrapper.h',
|
| 'browser/ui/webui/help/version_updater_basic.cc',
|
| @@ -3036,6 +3036,11 @@
|
| '../third_party/hunspell/hunspell.gyp:hunspell',
|
| ],
|
| }],
|
| + ['enable_extensions==1', {
|
| + 'dependencies': [
|
| + '<(DEPTH)/extensions/components/extensions_components.gyp:javascript_dialog_extensions_client',
|
| + ],
|
| + }],
|
| # Temporary fix to break the browser_ui target into smaller chunks so it
|
| # will link with SyzyASan builds.
|
| ['OS=="win" and syzyasan==1', {
|
|
|