Move JavaScriptDialogManager, JavascriptAppModalDialogViews to components/app_modal_dialogs

chrome/chrome_browser_ui.gypi

 # Copyright 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'chrome_browser_ui_non_ios_sources': [
       'browser/ui/accelerator_utils.h',
       'browser/ui/android/android_about_app_info.cc',
       'browser/ui/android/android_about_app_info.h',
       'browser/ui/android/autofill/autofill_dialog_controller_android.cc',
       'browser/ui/android/autofill/autofill_dialog_controller_android.h',
       'browser/ui/android/autofill/autofill_dialog_result.cc',
       'browser/ui/android/autofill/autofill_dialog_result.h',
       'browser/ui/android/autofill/autofill_logger_android.cc',
       'browser/ui/android/autofill/autofill_logger_android.h',
       'browser/ui/android/autofill/autofill_popup_view_android.cc',
       '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',
       'browser/ui/android/infobars/auto_login_infobar_delegate_android.h',
       'browser/ui/android/infobars/auto_login_prompter.cc',
       'browser/ui/android/infobars/auto_login_prompter.h',
       'browser/ui/android/infobars/confirm_infobar.cc',
       'browser/ui/android/infobars/confirm_infobar.h',
       'browser/ui/android/infobars/data_reduction_proxy_infobar.cc',
       'browser/ui/android/infobars/data_reduction_proxy_infobar.h',
@@ skipping 33 matching lines @@
       'browser/ui/android/tab_restore_service_delegate_android.cc',
       'browser/ui/android/website_settings_popup_android.cc',
       'browser/ui/android/website_settings_popup_android.h',
       'browser/ui/android/website_settings_popup_legacy_android.cc',
       'browser/ui/android/website_settings_popup_legacy_android.h',
       'browser/ui/android/window_android_helper.cc',
       'browser/ui/android/window_android_helper.h',
       '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',
       'browser/ui/autofill/autofill_dialog_models.h',
       'browser/ui/autofill/autofill_dialog_types.cc',
       'browser/ui/autofill/autofill_dialog_types.h',
       'browser/ui/autofill/autofill_popup_controller.h',
       'browser/ui/autofill/autofill_popup_controller_impl.cc',
       'browser/ui/autofill/autofill_popup_controller_impl.h',
       'browser/ui/autofill/autofill_popup_view.h',
@@ skipping 224 matching lines @@
       'browser/ui/cocoa/browser_window_utils.mm',
       'browser/ui/cocoa/bubble_combobox.h',
       'browser/ui/cocoa/bubble_combobox.mm',
       'browser/ui/cocoa/bubble_view.h',
       'browser/ui/cocoa/bubble_view.mm',
       'browser/ui/cocoa/certificate_viewer_mac.mm',
       'browser/ui/cocoa/chrome_browser_window.h',
       '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',
       'browser/ui/cocoa/command_observer_bridge.h',
       'browser/ui/cocoa/command_observer_bridge.mm',
       'browser/ui/cocoa/confirm_bubble_cocoa.h',
       'browser/ui/cocoa/confirm_bubble_cocoa.mm',
       'browser/ui/cocoa/confirm_bubble_controller.h',
       'browser/ui/cocoa/confirm_bubble_controller.mm',
       'browser/ui/cocoa/confirm_quit.h',
@@ skipping 1590 matching lines @@
       'browser/ui/views/bookmarks/bookmark_menu_controller_observer.h',
       'browser/ui/views/bookmarks/bookmark_menu_controller_views.cc',
       'browser/ui/views/bookmarks/bookmark_menu_controller_views.h',
       'browser/ui/views/bookmarks/bookmark_menu_delegate.cc',
       'browser/ui/views/bookmarks/bookmark_menu_delegate.h',
       'browser/ui/views/bookmarks/bookmark_sync_promo_view.cc',
       'browser/ui/views/bookmarks/bookmark_sync_promo_view.h',
       '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',
       'browser/ui/views/collected_cookies_views.h',
       'browser/ui/views/color_chooser_aura.cc',
       'browser/ui/views/color_chooser_aura.h',
       'browser/ui/views/color_chooser_win.cc',
       'browser/ui/views/confirm_bubble_views.cc',
       'browser/ui/views/confirm_bubble_views.h',
       'browser/ui/views/conflicting_module_view_win.cc',
@@ skipping 132 matching lines @@
       'browser/ui/views/infobars/confirm_infobar.cc',
       'browser/ui/views/infobars/confirm_infobar.h',
       'browser/ui/views/infobars/extension_infobar.cc',
       'browser/ui/views/infobars/extension_infobar.h',
       'browser/ui/views/infobars/infobar_background.cc',
       'browser/ui/views/infobars/infobar_background.h',
       'browser/ui/views/infobars/infobar_container_view.cc',
       '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',
       'browser/ui/views/location_bar/bubble_icon_view.h',
       'browser/ui/views/location_bar/content_setting_image_view.cc',
       'browser/ui/views/location_bar/content_setting_image_view.h',
       'browser/ui/views/location_bar/ev_bubble_view.cc',
       'browser/ui/views/location_bar/ev_bubble_view.h',
       'browser/ui/views/location_bar/generated_credit_card_view.cc',
       'browser/ui/views/location_bar/generated_credit_card_view.h',
@@ skipping 393 matching lines @@
     # Counts desktop Linux and ChromeOS.
     'chrome_browser_ui_linux_sources': [
       'browser/ui/startup/autolaunch_prompt.cc',
       'browser/ui/views/apps/chrome_apps_client_views.cc',
       'browser/ui/views/frame/taskbar_decorator.cc',
       'browser/ui/webui/certificate_viewer_ui.cc',
       'browser/ui/webui/certificate_viewer_ui.h',
       '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',
       'browser/ui/views/app_list/linux/app_list_service_linux.cc',
       'browser/ui/views/app_list/linux/app_list_service_linux.h',
       'browser/ui/views/first_run_dialog.cc',
       'browser/ui/views/first_run_dialog.h',
       'browser/ui/views/frame/browser_desktop_window_tree_host.h',
       'browser/ui/views/frame/browser_desktop_window_tree_host_x11.cc',
       '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',
       'browser/ui/webui/help/version_updater_basic.h',
     ],
     # Compiled for X11: desktop Linux and ChromeOS. We assume aura/views/ash.
     'chrome_browser_ui_x11_sources': [
       'browser/ui/views/frame/browser_command_handler_x11.cc',
       'browser/ui/views/frame/browser_command_handler_x11.h',
       'browser/ui/views/frame/global_menu_bar_registrar_x11.cc',
@@ skipping 509 matching lines @@
           'sources': [ '<@(chrome_browser_ui_webrtc_sources)' ],
         }],
         ['enable_service_discovery==1', {
           'sources': [ '<@(chrome_browser_ui_service_discovery_sources)' ],
         }],
         ['enable_spellcheck==1', {
           'dependencies': [
             '../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', {
           'msvs_shard': 4,
         }],
         ['OS!="android" and OS!="ios"', {
           'dependencies': [
             '../device/bluetooth/bluetooth.gyp:device_bluetooth',
           ],
           'sources': [ '<@(chrome_browser_ui_non_mobile_sources)' ],
         }],
       ],
     },
   ],
 }