Move JavaScriptDialogManager, JavascriptAppModalDialogViews to components/app_modal_dialogs

chrome/chrome_browser_ui.gypi

Index: chrome/chrome_browser_ui.gypi
diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi
index c4240ca34dcc3203db6d23e8eff25978fe6ef204..eeecd7299f0c87223c617c991edb733c4d07925c 100644
--- a/chrome/chrome_browser_ui.gypi
+++ b/chrome/chrome_browser_ui.gypi
@@ -18,6 +18,7 @@
       'browser/ui/android/autofill/autofill_popup_view_android.h',
       'browser/ui/android/autofill/password_generation_popup_view_android.cc',
       'browser/ui/android/autofill/password_generation_popup_view_android.h',
+      'browser/ui/android/chrome_javascript_native_dialog_factory_android.cc',

[msw, 2014/11/05 03:53:55]

Should these gypi changes also be made to a GN file somewhere?
(not sure it exists yet, but checking just in case)

[oshima, 2014/11/05 21:42:18]

This change gets automatically propagated to GN via
chrome_browser_ui_non_ios_soruces defined above.

       'browser/ui/android/content_settings/popup_blocked_infobar_delegate.cc',
       'browser/ui/android/content_settings/popup_blocked_infobar_delegate.h',
       'browser/ui/android/infobars/auto_login_infobar_delegate_android.cc',
@@ -71,8 +72,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',
@@ -317,6 +317,7 @@
       'browser/ui/cocoa/chrome_browser_window.mm',
       'browser/ui/cocoa/chrome_event_processing_window.h',
       'browser/ui/cocoa/chrome_event_processing_window.mm',
+      'browser/ui/cocoa/chrome_javascript_native_dialog_factory_cocoa.mm',
       'browser/ui/cocoa/clickhold_button_cell.h',
       'browser/ui/cocoa/clickhold_button_cell.mm',
       'browser/ui/cocoa/color_chooser_mac.mm',
@@ -1927,6 +1928,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 +2081,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 +2494,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 +2507,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 +3038,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', {