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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1391893003: NOT FOR REVIEW: Aura on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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
« no previous file with comments | « chrome/browser/supervised_user/supervised_user_interstitial.cc ('k') | chrome/browser/ui/android/autofill/autofill_keyboard_accessory_view.cc » ('j') | content/browser/BUILD.gn » ('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 b13909c6d50c961ee97f9cfd645627d81d6214a9..0e4609418dacd64221ceb8a17b5bc613ed2d7046 100644
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -85,6 +85,7 @@ source_set("ui") {
sources += rebase_path(gypi_values.chrome_browser_ui_toolbar_model_sources,
".",
"//chrome")
+
deps += [
"//chrome/browser/devtools",
"//chrome/browser/ui/views",
@@ -118,7 +119,7 @@ source_set("ui") {
deps += [ "//net" ]
}
- if (!is_android && !is_ios) {
+ if (!is_ios) {
sources += rebase_path(gypi_values.chrome_browser_ui_non_mobile_sources,
".",
"//chrome")
@@ -133,6 +134,96 @@ source_set("ui") {
"//device/bluetooth",
"//third_party/libusb",
]
+
+ if (use_aura && is_android) {
+ sources += [
+ "views/screen_capture_notification_ui_views.cc",
+ ]
+ # chrome_browser_ui_toolbar_model_sources
+ sources -= [
+ "android/toolbar/toolbar_model_android.cc",
+ "android/toolbar/toolbar_model_android.h",
+ ]
+
+ #chrome_browser_ui_non_ios_sources
+ sources -= [
+# "android/android_about_app_info.cc",
+# "android/android_about_app_info.h",
+ "android/autofill/autofill_dialog_controller_android.cc",
+ "android/autofill/autofill_dialog_controller_android.h",
+ "android/autofill/autofill_dialog_result.cc",
+ "android/autofill/autofill_dialog_result.h",
+ "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/password_generation_popup_view_android.cc",
+ "android/autofill/password_generation_popup_view_android.h",
+ "android/certificate_viewer_android.cc",
+ "android/certificate_viewer_android.h",
+ "android/chrome_http_auth_handler.cc",
+ "android/chrome_http_auth_handler.h",
+ "android/color_chooser_dialog_android.cc",
+ "android/connection_info_popup_android.cc",
+ "android/connection_info_popup_android.h",
+ "android/content_settings/popup_blocked_infobar_delegate.cc",
+ "android/content_settings/popup_blocked_infobar_delegate.h",
+ "android/context_menu_helper.cc",
+ "android/context_menu_helper.h",
+# "android/external_protocol_dialog_android.cc",
+ "android/infobars/app_banner_infobar_android.cc",
+ "android/infobars/app_banner_infobar_android.h",
+ "android/infobars/confirm_infobar.cc",
+ "android/infobars/confirm_infobar.h",
+ "android/infobars/data_reduction_proxy_infobar.cc",
+ "android/infobars/data_reduction_proxy_infobar.h",
+ "android/infobars/download_overwrite_infobar.cc",
+ "android/infobars/download_overwrite_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/save_password_infobar.cc",
+ "android/infobars/save_password_infobar.h",
+ "android/infobars/translate_infobar.cc",
+ "android/infobars/translate_infobar.h",
+ "android/javascript_app_modal_dialog_android.cc",
+ "android/login_prompt_android.cc",
+ "android/navigation_popup.cc",
+ "android/navigation_popup.h",
+ "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/simple_message_box_android.cc",
+ "android/ssl_client_certificate_request.cc",
+ "android/ssl_client_certificate_request.h",
+# "android/status_tray_android.cc",
+ "android/tab_contents/chrome_web_contents_view_delegate_android.cc",
+ "android/tab_contents/chrome_web_contents_view_delegate_android.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_restore_service_delegate_android.cc",
+ "android/website_settings_popup_android.cc",
+ "android/website_settings_popup_android.h",
+ "android/window_android_helper.cc",
+ "android/window_android_helper.h",
+
+ "browser_otr_state_android.cc",
+ ]
+
+ deps -= [ "//third_party/libusb", ]
+ }
}
if (enable_basic_printing || enable_print_preview) {
@@ -205,7 +296,7 @@ source_set("ui") {
deps += [ "//extensions/components/native_app_window" ]
}
- if (!is_chromeos && (!is_mac || mac_views_browser)) {
+ if (!is_chromeos && (!is_mac || mac_views_browser) && !is_android) {
sources +=
rebase_path(gypi_values.chrome_browser_ui_views_non_chromeos_sources,
".",
@@ -238,6 +329,12 @@ source_set("ui") {
".",
"//chrome")
}
+ if (is_android && use_aura) {
+ sources -= [
+ "views/apps/app_info_dialog/app_info_dialog_views.cc",
+ "views/apps/app_info_dialog/app_info_dialog_views.h",
+ ]
+ }
}
if (use_aura && !use_ozone && is_desktop_linux) {
deps += [
@@ -290,17 +387,22 @@ source_set("ui") {
deps += [
"//chrome/browser:jni_headers",
"//crypto:platform",
- "//components/web_contents_delegate_android",
]
- deps -= [
- "//chrome/browser/ui/views",
- "//ui/events",
- ]
- sources += rebase_path(gypi_values.chrome_browser_ui_android_sources,
- ".",
- "//chrome")
defines += [ "CHROME_BUILD_ID=" + android_chrome_build_id ]
+
+ if (!use_aura) {
+ sources += rebase_path(gypi_values.chrome_browser_ui_android_sources,
+ ".",
+ "//chrome")
+ deps += [
+ "//components/web_contents_delegate_android",
+ ]
+ deps -= [
+ "//chrome/browser/ui/views",
+ "//ui/events",
+ ]
+ }
}
if (is_mac) {
@@ -370,7 +472,7 @@ source_set("ui") {
"webui/help/version_updater_basic.h",
]
}
- } else { # 'OS!="win"
+ } else { # OS!="win"
if (toolkit_views) {
public_deps += [
"//ui/views",
@@ -402,6 +504,13 @@ source_set("ui") {
sources -= [ "views/tabs/window_finder_x11.cc" ]
}
}
+ } else if (use_aura && is_android) {
+ sources += [
+ "startup/autolaunch_prompt.cc",
+ "webui/certificate_viewer_ui.cc",
+ "webui/certificate_viewer_ui.h",
+ "//chrome/browser/ui/views/frame/native_browser_frame_factory_android.cc",
+ ]
}
if (enable_app_list) {
@@ -419,7 +528,7 @@ source_set("ui") {
rebase_path(gypi_values.chrome_browser_ui_autofill_dialog_sources,
".",
"//chrome")
- if (!is_android && !is_ios) {
+ if (!is_ios) {
sources += rebase_path(
gypi_values.chrome_browser_ui_autofill_dialog_non_mobile_sources,
".",
« no previous file with comments | « chrome/browser/supervised_user/supervised_user_interstitial.cc ('k') | chrome/browser/ui/android/autofill/autofill_keyboard_accessory_view.cc » ('j') | content/browser/BUILD.gn » ('J')

Powered by Google App Engine
This is Rietveld 408576698