Aura on Android: Making it possible to generate GN build configuration

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': {
     # There are two sections of sources:
     # * "Platform"-based sources (OS, toolkit, etc.)
     # * Feature/directory-based sources (e.g., history, printing)
 
     ### Platform-based sources ###
     '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',

[no sievers, 2015/10/13 20:47:47]

why the changes in here though? or rather, why did you leave some android files
under 'chrome_browser_ui_non_ios_sources'?

[mfomitchev, 2015/10/13 21:27:10]

This is basically what we did in https://codereview.chromium.org/1391893003/,
except that instead of removing the files explicitly in
chrome/browser/ui/BUILD.gn, I've moved them from
chrome_browser_ui_non_ios_sources to chrome_browser_ui_android_sources.

We could probably remove more (if not all of them). I suggest we log a bug to
make sure we remember. Alternatively, we can do it now, but that would mean we'd
need to do more work before we can have it running.

-      '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_keyboard_accessory_view.cc',
-      'browser/ui/android/autofill/autofill_keyboard_accessory_view.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/card_unmask_prompt_view_android.cc',
-      'browser/ui/android/autofill/card_unmask_prompt_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/bluetooth_chooser_android.cc',
-      'browser/ui/android/bluetooth_chooser_android.h',
-      'browser/ui/android/certificate_viewer_android.cc',
-      'browser/ui/android/certificate_viewer_android.h',
-      'browser/ui/android/chrome_http_auth_handler.cc',
-      'browser/ui/android/chrome_http_auth_handler.h',
-      'browser/ui/android/color_chooser_dialog_android.cc',
-      'browser/ui/android/connection_info_popup_android.cc',
-      'browser/ui/android/connection_info_popup_android.h',
-      'browser/ui/android/content_settings/popup_blocked_infobar_delegate.cc',
-      'browser/ui/android/content_settings/popup_blocked_infobar_delegate.h',
-      'browser/ui/android/context_menu_helper.cc',
-      'browser/ui/android/context_menu_helper.h',
       'browser/ui/android/external_protocol_dialog_android.cc',
-      'browser/ui/android/infobars/app_banner_infobar_android.cc',
-      'browser/ui/android/infobars/app_banner_infobar_android.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',
-      'browser/ui/android/infobars/download_overwrite_infobar.cc',
-      'browser/ui/android/infobars/download_overwrite_infobar.h',
-      'browser/ui/android/infobars/infobar_android.cc',
-      'browser/ui/android/infobars/infobar_android.h',
-      'browser/ui/android/infobars/infobar_container_android.cc',
-      'browser/ui/android/infobars/infobar_container_android.h',
-      'browser/ui/android/infobars/save_password_infobar.cc',
-      'browser/ui/android/infobars/save_password_infobar.h',
-      'browser/ui/android/infobars/translate_infobar.cc',
-      'browser/ui/android/infobars/translate_infobar.h',
-      'browser/ui/android/javascript_app_modal_dialog_android.cc',
-      'browser/ui/android/login_prompt_android.cc',
-      'browser/ui/android/omnibox/omnibox_url_emphasizer.cc',
-      'browser/ui/android/omnibox/omnibox_url_emphasizer.h',
-      'browser/ui/android/omnibox/omnibox_view_util.cc',
-      'browser/ui/android/omnibox/omnibox_view_util.h',
-      'browser/ui/android/simple_message_box_android.cc',
-      'browser/ui/android/ssl_client_certificate_request.cc',
-      'browser/ui/android/ssl_client_certificate_request.h',
       'browser/ui/android/status_tray_android.cc',
-      'browser/ui/android/tab_contents/chrome_web_contents_view_delegate_android.cc',
-      'browser/ui/android/tab_contents/chrome_web_contents_view_delegate_android.h',
-      'browser/ui/android/tab_model/single_tab_model.cc',
-      'browser/ui/android/tab_model/single_tab_model.h',
-      'browser/ui/android/tab_model/tab_model.cc',
-      'browser/ui/android/tab_model/tab_model.h',
-      'browser/ui/android/tab_model/tab_model_jni_bridge.cc',
-      'browser/ui/android/tab_model/tab_model_jni_bridge.h',
       'browser/ui/android/tab_model/tab_model_list.cc',
       'browser/ui/android/tab_model/tab_model_list.h',
-      'browser/ui/android/website_settings_popup_android.cc',
-      'browser/ui/android/website_settings_popup_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/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',
@@ skipping 39 matching lines @@
       'browser/ui/bookmarks/recently_used_folders_combo_model.h',
       'browser/ui/browser_commands_chromeos.cc',
       'browser/ui/browser_commands_chromeos.h',
       'browser/ui/browser_commands_mac.cc',
       'browser/ui/browser_commands_mac.h',
       'browser/ui/browser_dialogs.h',
       'browser/ui/browser_mac.cc',
       'browser/ui/browser_mac.h',
       'browser/ui/browser_navigator_params.cc',
       'browser/ui/browser_navigator_params.h',
-      'browser/ui/browser_otr_state_android.cc',
       'browser/ui/browser_ui_prefs.cc',
       'browser/ui/browser_ui_prefs.h',
       'browser/ui/browser_win.cc',
       'browser/ui/browser_window.h',
       'browser/ui/chrome_select_file_policy.cc',
       'browser/ui/chrome_select_file_policy.h',
       'browser/ui/confirm_bubble.h',
       'browser/ui/crypto_module_password_dialog.h',
       'browser/ui/find_bar/find_bar.h',
       'browser/ui/find_bar/find_bar_state.h',
@@ skipping 323 matching lines @@
       'browser/ui/webui/version_handler_chromeos.cc',
       'browser/ui/webui/version_handler_chromeos.h',
       'browser/ui/webui/version_ui.cc',
       'browser/ui/webui/version_ui.h',
       'browser/ui/window_sizer/window_sizer_mac.mm',
       'browser/ui/zoom/chrome_zoom_level_otr_delegate.cc',
       'browser/ui/zoom/chrome_zoom_level_otr_delegate.h',
       'browser/ui/zoom/chrome_zoom_level_prefs.cc',
       'browser/ui/zoom/chrome_zoom_level_prefs.h',
     ],
     'chrome_browser_ui_android_sources': [

[no sievers, 2015/10/13 21:52:05]

mind renaming this to 'chrome_browser_ui_android_non_aura_sources' then?

[mfomitchev, 2015/10/14 16:02:30]

Done.

+      '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_keyboard_accessory_view.cc',
+      'browser/ui/android/autofill/autofill_keyboard_accessory_view.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/card_unmask_prompt_view_android.cc',
+      'browser/ui/android/autofill/card_unmask_prompt_view_android.h',
       'browser/ui/android/autofill/credit_card_scanner_view_android.cc',
       'browser/ui/android/autofill/credit_card_scanner_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/bluetooth_chooser_android.cc',
+      'browser/ui/android/bluetooth_chooser_android.h',
+      'browser/ui/android/certificate_viewer_android.cc',
+      'browser/ui/android/certificate_viewer_android.h',
+      'browser/ui/android/chrome_http_auth_handler.cc',
+      'browser/ui/android/chrome_http_auth_handler.h',
+      'browser/ui/android/color_chooser_dialog_android.cc',
+      'browser/ui/android/connection_info_popup_android.cc',
+      'browser/ui/android/connection_info_popup_android.h',
+      'browser/ui/android/content_settings/popup_blocked_infobar_delegate.cc',
+      'browser/ui/android/content_settings/popup_blocked_infobar_delegate.h',
+      'browser/ui/android/context_menu_helper.cc',
+      'browser/ui/android/context_menu_helper.h',
+      'browser/ui/android/infobars/app_banner_infobar_android.cc',
+      'browser/ui/android/infobars/app_banner_infobar_android.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',
+      'browser/ui/android/infobars/download_overwrite_infobar.cc',
+      'browser/ui/android/infobars/download_overwrite_infobar.h',
       'browser/ui/android/infobars/generated_password_saved_infobar.cc',
       'browser/ui/android/infobars/generated_password_saved_infobar.h',
+      'browser/ui/android/infobars/infobar_android.cc',
+      'browser/ui/android/infobars/infobar_android.h',
+      'browser/ui/android/infobars/infobar_container_android.cc',
+      'browser/ui/android/infobars/infobar_container_android.h',
+      'browser/ui/android/infobars/save_password_infobar.cc',
+      'browser/ui/android/infobars/save_password_infobar.h',
+      'browser/ui/android/infobars/translate_infobar.cc',
+      'browser/ui/android/infobars/translate_infobar.h',
+      'browser/ui/android/javascript_app_modal_dialog_android.cc',
+      'browser/ui/android/login_prompt_android.cc',
+      'browser/ui/android/omnibox/omnibox_url_emphasizer.cc',
+      'browser/ui/android/omnibox/omnibox_url_emphasizer.h',
+      'browser/ui/android/omnibox/omnibox_view_util.cc',
+      'browser/ui/android/omnibox/omnibox_view_util.h',
+      'browser/ui/android/simple_message_box_android.cc',
       'browser/ui/android/snackbars/auto_signin_snackbar_controller.cc',
       'browser/ui/android/snackbars/auto_signin_snackbar_controller.h',
+      'browser/ui/android/ssl_client_certificate_request.cc',
+      'browser/ui/android/ssl_client_certificate_request.h',
+      'browser/ui/android/tab_contents/chrome_web_contents_view_delegate_android.cc',
+      'browser/ui/android/tab_contents/chrome_web_contents_view_delegate_android.h',
+      'browser/ui/android/tab_model/single_tab_model.cc',
+      'browser/ui/android/tab_model/single_tab_model.h',
+      'browser/ui/android/tab_model/tab_model.cc',
+      'browser/ui/android/tab_model/tab_model.h',
+      'browser/ui/android/tab_model/tab_model_jni_bridge.cc',
+      'browser/ui/android/tab_model/tab_model_jni_bridge.h',
+      'browser/ui/android/website_settings_popup_android.cc',
+      'browser/ui/android/website_settings_popup_android.h',
+      'browser/ui/android/window_android_helper.cc',
+      'browser/ui/android/window_android_helper.h',
+      'browser/ui/browser_otr_state_android.cc',
       'browser/ui/screen_capture_notification_ui_stub.cc',
       'browser/ui/webui/popular_sites_internals_message_handler.cc',
       'browser/ui/webui/popular_sites_internals_message_handler.h',
       'browser/ui/webui/popular_sites_internals_ui.cc',
       'browser/ui/webui/popular_sites_internals_ui.h',
     ],
     # Cross-platform ash sources.
     'chrome_browser_ui_ash_sources': [
       'browser/ui/ash/app_list/app_list_controller_ash.cc',
       'browser/ui/ash/app_list/app_list_controller_ash.h',
@@ skipping 2722 matching lines @@
           ],
           'sources': [
             '<@(chrome_browser_ui_non_mobile_sources)',
             '<@(chrome_browser_ui_omnibox_non_mobile_sources)',
           ],
         }],
       ],
     },
   ],
 }