Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(91)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/BUILD.gn

Issue 2619603002: Remove android_java_ui as it is not used (Closed)
Patch Set: Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« chrome/browser/supervised_user/supervised_user_interstitial.cc ('K') | « chrome/browser/sync/sessions/notification_service_sessions_router.cc ('k') | chrome/browser/ui/autofill/chrome_autofill_client.cc » ('j') | chrome/browser/ui/autofill/chrome_autofill_client.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/BUILD.gn
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
index fe4b4546b1de38a0ec18427d899f4cf6dd9af436..2226f9f49d9ffb5520007b4d6cdec4db9c76031e 100644
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -631,7 +631,7 @@ split_static_library("ui") {
defines += [ "USE_CRAS" ]
}
- if (!android_java_ui) {
+ if (!is_android) {
sources += [
"apps/app_info_dialog.h",
"apps/chrome_app_delegate.cc",
@@ -2146,140 +2146,138 @@ split_static_library("ui") {
"//ui/android",
]
- if (android_java_ui) {
- sources += [
- "android/autofill/autofill_keyboard_accessory_view.cc",
- "android/autofill/autofill_keyboard_accessory_view.h",
- "android/autofill/autofill_logger_android.cc",
- "android/autofill/autofill_logger_android.h",
- "android/autofill/autofill_popup_view_android.cc",
- "android/autofill/autofill_popup_view_android.h",
- "android/autofill/card_unmask_prompt_view_android.cc",
- "android/autofill/card_unmask_prompt_view_android.h",
- "android/autofill/credit_card_scanner_view_android.cc",
- "android/autofill/credit_card_scanner_view_android.h",
- "android/autofill/password_generation_popup_view_android.cc",
- "android/autofill/password_generation_popup_view_android.h",
- "android/bluetooth_chooser_android.cc",
- "android/bluetooth_chooser_android.h",
- "android/chrome_http_auth_handler.cc",
- "android/chrome_http_auth_handler.h",
- "android/color_chooser_dialog_android.cc",
- "android/content_settings/popup_blocked_infobar_delegate.cc",
- "android/content_settings/popup_blocked_infobar_delegate.h",
- "android/content_settings/subresource_filter_infobar_delegate.cc",
- "android/content_settings/subresource_filter_infobar_delegate.h",
- "android/context_menu_helper.cc",
- "android/context_menu_helper.h",
- "android/infobars/app_banner_infobar_android.cc",
- "android/infobars/app_banner_infobar_android.h",
- "android/infobars/autofill_credit_card_filling_infobar.cc",
- "android/infobars/autofill_credit_card_filling_infobar.h",
- "android/infobars/autofill_save_card_infobar.cc",
- "android/infobars/autofill_save_card_infobar.h",
- "android/infobars/confirm_infobar.cc",
- "android/infobars/confirm_infobar.h",
- "android/infobars/data_reduction_promo_infobar.cc",
- "android/infobars/data_reduction_promo_infobar.h",
- "android/infobars/duplicate_download_infobar.cc",
- "android/infobars/duplicate_download_infobar.h",
- "android/infobars/generated_password_saved_infobar.cc",
- "android/infobars/generated_password_saved_infobar.h",
- "android/infobars/grouped_permission_infobar.cc",
- "android/infobars/grouped_permission_infobar.h",
- "android/infobars/infobar_android.cc",
- "android/infobars/infobar_android.h",
- "android/infobars/infobar_container_android.cc",
- "android/infobars/infobar_container_android.h",
- "android/infobars/instant_apps_infobar.cc",
- "android/infobars/instant_apps_infobar.h",
- "android/infobars/permission_infobar.cc",
- "android/infobars/permission_infobar.h",
- "android/infobars/search_geolocation_disclosure_infobar.cc",
- "android/infobars/search_geolocation_disclosure_infobar.h",
- "android/infobars/simple_confirm_infobar_builder.cc",
- "android/infobars/simple_confirm_infobar_builder.h",
- "android/infobars/subresource_filter_infobar.cc",
- "android/infobars/subresource_filter_infobar.h",
- "android/infobars/translate_infobar.cc",
- "android/infobars/translate_infobar.h",
- "android/infobars/update_password_infobar.cc",
- "android/infobars/update_password_infobar.h",
- "android/javascript_app_modal_dialog_android.cc",
- "android/login_handler_android.cc",
- "android/omnibox/omnibox_url_emphasizer.cc",
- "android/omnibox/omnibox_url_emphasizer.h",
- "android/omnibox/omnibox_view_util.cc",
- "android/omnibox/omnibox_view_util.h",
- "android/page_info/certificate_chain_helper.cc",
- "android/page_info/certificate_chain_helper.h",
- "android/page_info/certificate_viewer_android.cc",
- "android/page_info/certificate_viewer_android.h",
- "android/page_info/connection_info_popup_android.cc",
- "android/page_info/connection_info_popup_android.h",
- "android/page_info/website_settings_popup_android.cc",
- "android/page_info/website_settings_popup_android.h",
- "android/simple_message_box_android.cc",
- "android/snackbars/auto_signin_prompt_controller.cc",
- "android/snackbars/auto_signin_prompt_controller.h",
- "android/ssl_client_certificate_request.cc",
- "android/ssl_client_certificate_request.h",
- "android/tab_contents/chrome_web_contents_view_delegate_android.cc",
- "android/tab_contents/chrome_web_contents_view_delegate_android.h",
- "android/tab_model/android_live_tab_context.cc",
- "android/tab_model/android_live_tab_context.h",
- "android/tab_model/single_tab_model.cc",
- "android/tab_model/single_tab_model.h",
- "android/tab_model/tab_model.cc",
- "android/tab_model/tab_model.h",
- "android/tab_model/tab_model_jni_bridge.cc",
- "android/tab_model/tab_model_jni_bridge.h",
- "android/tab_model/tab_model_list.cc",
- "android/tab_model/tab_model_list.h",
- "android/tab_model/tab_model_selector_base.cc",
- "android/tab_model/tab_model_selector_base.h",
- "android/toolbar/toolbar_model_android.cc",
- "android/toolbar/toolbar_model_android.h",
- "android/usb_chooser_dialog_android.cc",
- "android/usb_chooser_dialog_android.h",
- "android/view_android_helper.cc",
- "android/view_android_helper.h",
- "browser_otr_state_android.cc",
- "screen_capture_notification_ui_stub.cc",
- "webui/offline/offline_internals_ui.cc",
- "webui/offline/offline_internals_ui.h",
- "webui/offline/offline_internals_ui_message_handler.cc",
- "webui/offline/offline_internals_ui_message_handler.h",
- "webui/popular_sites_internals_ui.cc",
- "webui/popular_sites_internals_ui.h",
- "webui/snippets_internals_message_handler.cc",
- "webui/snippets_internals_message_handler.h",
- "webui/snippets_internals_ui.cc",
- "webui/snippets_internals_ui.h",
- ]
- if (enable_vr_shell || enable_webvr) {
- if (enable_vr_shell) {
- defines += [ "ENABLE_VR_SHELL" ]
- }
- sources += [
- "webui/vr_shell/vr_shell_ui_message_handler.cc",
- "webui/vr_shell/vr_shell_ui_message_handler.h",
- "webui/vr_shell/vr_shell_ui_ui.cc",
- "webui/vr_shell/vr_shell_ui_ui.h",
- ]
- configs += [ "//third_party/gvr-android-sdk:libgvr_config" ]
- deps += [ "//chrome/browser/android/vr_shell:vr_common" ]
- }
- if (enable_vr_shell_ui_dev) {
- assert(enable_vr_shell)
- defines += [ "ENABLE_VR_SHELL_UI_DEV" ]
+ sources += [
+ "android/autofill/autofill_keyboard_accessory_view.cc",
+ "android/autofill/autofill_keyboard_accessory_view.h",
+ "android/autofill/autofill_logger_android.cc",
+ "android/autofill/autofill_logger_android.h",
+ "android/autofill/autofill_popup_view_android.cc",
+ "android/autofill/autofill_popup_view_android.h",
+ "android/autofill/card_unmask_prompt_view_android.cc",
+ "android/autofill/card_unmask_prompt_view_android.h",
+ "android/autofill/credit_card_scanner_view_android.cc",
+ "android/autofill/credit_card_scanner_view_android.h",
+ "android/autofill/password_generation_popup_view_android.cc",
+ "android/autofill/password_generation_popup_view_android.h",
+ "android/bluetooth_chooser_android.cc",
+ "android/bluetooth_chooser_android.h",
+ "android/chrome_http_auth_handler.cc",
+ "android/chrome_http_auth_handler.h",
+ "android/color_chooser_dialog_android.cc",
+ "android/content_settings/popup_blocked_infobar_delegate.cc",
+ "android/content_settings/popup_blocked_infobar_delegate.h",
+ "android/content_settings/subresource_filter_infobar_delegate.cc",
+ "android/content_settings/subresource_filter_infobar_delegate.h",
+ "android/context_menu_helper.cc",
+ "android/context_menu_helper.h",
+ "android/infobars/app_banner_infobar_android.cc",
+ "android/infobars/app_banner_infobar_android.h",
+ "android/infobars/autofill_credit_card_filling_infobar.cc",
+ "android/infobars/autofill_credit_card_filling_infobar.h",
+ "android/infobars/autofill_save_card_infobar.cc",
+ "android/infobars/autofill_save_card_infobar.h",
+ "android/infobars/confirm_infobar.cc",
+ "android/infobars/confirm_infobar.h",
+ "android/infobars/data_reduction_promo_infobar.cc",
+ "android/infobars/data_reduction_promo_infobar.h",
+ "android/infobars/duplicate_download_infobar.cc",
+ "android/infobars/duplicate_download_infobar.h",
+ "android/infobars/generated_password_saved_infobar.cc",
+ "android/infobars/generated_password_saved_infobar.h",
+ "android/infobars/grouped_permission_infobar.cc",
+ "android/infobars/grouped_permission_infobar.h",
+ "android/infobars/infobar_android.cc",
+ "android/infobars/infobar_android.h",
+ "android/infobars/infobar_container_android.cc",
+ "android/infobars/infobar_container_android.h",
+ "android/infobars/instant_apps_infobar.cc",
+ "android/infobars/instant_apps_infobar.h",
+ "android/infobars/permission_infobar.cc",
+ "android/infobars/permission_infobar.h",
+ "android/infobars/search_geolocation_disclosure_infobar.cc",
+ "android/infobars/search_geolocation_disclosure_infobar.h",
+ "android/infobars/simple_confirm_infobar_builder.cc",
+ "android/infobars/simple_confirm_infobar_builder.h",
+ "android/infobars/subresource_filter_infobar.cc",
+ "android/infobars/subresource_filter_infobar.h",
+ "android/infobars/translate_infobar.cc",
+ "android/infobars/translate_infobar.h",
+ "android/infobars/update_password_infobar.cc",
+ "android/infobars/update_password_infobar.h",
+ "android/javascript_app_modal_dialog_android.cc",
+ "android/login_handler_android.cc",
+ "android/omnibox/omnibox_url_emphasizer.cc",
+ "android/omnibox/omnibox_url_emphasizer.h",
+ "android/omnibox/omnibox_view_util.cc",
+ "android/omnibox/omnibox_view_util.h",
+ "android/page_info/certificate_chain_helper.cc",
+ "android/page_info/certificate_chain_helper.h",
+ "android/page_info/certificate_viewer_android.cc",
+ "android/page_info/certificate_viewer_android.h",
+ "android/page_info/connection_info_popup_android.cc",
+ "android/page_info/connection_info_popup_android.h",
+ "android/page_info/website_settings_popup_android.cc",
+ "android/page_info/website_settings_popup_android.h",
+ "android/simple_message_box_android.cc",
+ "android/snackbars/auto_signin_prompt_controller.cc",
+ "android/snackbars/auto_signin_prompt_controller.h",
+ "android/ssl_client_certificate_request.cc",
+ "android/ssl_client_certificate_request.h",
+ "android/tab_contents/chrome_web_contents_view_delegate_android.cc",
+ "android/tab_contents/chrome_web_contents_view_delegate_android.h",
+ "android/tab_model/android_live_tab_context.cc",
+ "android/tab_model/android_live_tab_context.h",
+ "android/tab_model/single_tab_model.cc",
+ "android/tab_model/single_tab_model.h",
+ "android/tab_model/tab_model.cc",
+ "android/tab_model/tab_model.h",
+ "android/tab_model/tab_model_jni_bridge.cc",
+ "android/tab_model/tab_model_jni_bridge.h",
+ "android/tab_model/tab_model_list.cc",
+ "android/tab_model/tab_model_list.h",
+ "android/tab_model/tab_model_selector_base.cc",
+ "android/tab_model/tab_model_selector_base.h",
+ "android/toolbar/toolbar_model_android.cc",
+ "android/toolbar/toolbar_model_android.h",
+ "android/usb_chooser_dialog_android.cc",
+ "android/usb_chooser_dialog_android.h",
+ "android/view_android_helper.cc",
+ "android/view_android_helper.h",
+ "browser_otr_state_android.cc",
+ "screen_capture_notification_ui_stub.cc",
+ "webui/offline/offline_internals_ui.cc",
+ "webui/offline/offline_internals_ui.h",
+ "webui/offline/offline_internals_ui_message_handler.cc",
+ "webui/offline/offline_internals_ui_message_handler.h",
+ "webui/popular_sites_internals_ui.cc",
+ "webui/popular_sites_internals_ui.h",
+ "webui/snippets_internals_message_handler.cc",
+ "webui/snippets_internals_message_handler.h",
+ "webui/snippets_internals_ui.cc",
+ "webui/snippets_internals_ui.h",
+ ]
+ if (enable_vr_shell || enable_webvr) {
+ if (enable_vr_shell) {
+ defines += [ "ENABLE_VR_SHELL" ]
}
- deps += [
- "//chrome/browser:jni_headers",
- "//components/web_contents_delegate_android",
+ sources += [
+ "webui/vr_shell/vr_shell_ui_message_handler.cc",
+ "webui/vr_shell/vr_shell_ui_message_handler.h",
+ "webui/vr_shell/vr_shell_ui_ui.cc",
+ "webui/vr_shell/vr_shell_ui_ui.h",
]
- deps -= [ "//ui/events" ]
+ configs += [ "//third_party/gvr-android-sdk:libgvr_config" ]
+ deps += [ "//chrome/browser/android/vr_shell:vr_common" ]
+ }
+ if (enable_vr_shell_ui_dev) {
+ assert(enable_vr_shell)
+ defines += [ "ENABLE_VR_SHELL_UI_DEV" ]
}
+ deps += [
+ "//chrome/browser:jni_headers",
+ "//components/web_contents_delegate_android",
+ ]
+ deps -= [ "//ui/events" ]
} else {
# !is_android
sources += [
@@ -3282,7 +3280,7 @@ split_static_library("ui") {
"app_list/app_list_service_disabled_mac.mm",
]
}
- if (!android_java_ui) {
+ if (!is_android) {
deps += [
"//third_party/libaddressinput",
"//third_party/libaddressinput:strings",
« chrome/browser/supervised_user/supervised_user_interstitial.cc ('K') | « chrome/browser/sync/sessions/notification_service_sessions_router.cc ('k') | chrome/browser/ui/autofill/chrome_autofill_client.cc » ('j') | chrome/browser/ui/autofill/chrome_autofill_client.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698