| Index: chrome/chrome_browser_ui.gypi
|
| diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi
|
| index c3696457ca586b32b154e8da8fae0348aaa97988..6afca5493639ac4b3bdcfaf1bcbdd12b88aaf763 100644
|
| --- a/chrome/chrome_browser_ui.gypi
|
| +++ b/chrome/chrome_browser_ui.gypi
|
| @@ -13,74 +13,10 @@
|
| '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_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.
|
| @@ -140,7 +76,6 @@
|
| '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',
|
| @@ -484,13 +419,78 @@
|
| 'browser/ui/zoom/chrome_zoom_level_prefs.cc',
|
| 'browser/ui/zoom/chrome_zoom_level_prefs.h',
|
| ],
|
| - 'chrome_browser_ui_android_sources': [
|
| + 'chrome_browser_ui_android_non_aura_sources': [
|
| + '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',
|
| @@ -3005,7 +3005,7 @@
|
| '../ui/events/events.gyp:events',
|
| 'chrome_browser_ui_views.gyp:browser_ui_views',
|
| ],
|
| - 'sources': [ '<@(chrome_browser_ui_android_sources)' ],
|
| + 'sources': [ '<@(chrome_browser_ui_android_non_aura_sources)' ],
|
| }],
|
| ['OS=="mac"', {
|
| 'sources': [ '<@(chrome_browser_ui_mac_sources)' ],
|
|
|