Index: chrome/chrome_browser_ui.gypi |
diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi |
index b2eaefb4f15eaf255a56457f247401a6856db643..4379ee9ba478daadfe99c6948c81044ece1b3ab1 100644 |
--- a/chrome/chrome_browser_ui.gypi |
+++ b/chrome/chrome_browser_ui.gypi |
@@ -71,8 +71,8 @@ |
'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_dialog_manager_client.cc', |
+ 'browser/ui/app_modal_dialogs/chrome_javascript_dialog_manager_client.h', |
'browser/ui/autofill/autofill_dialog_controller.cc', |
'browser/ui/autofill/autofill_dialog_controller.h', |
'browser/ui/autofill/autofill_dialog_models.cc', |
@@ -1924,6 +1924,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_app_modal_dialog_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', |
@@ -2076,8 +2077,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', |
@@ -2489,7 +2488,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', |
@@ -2502,6 +2501,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', |