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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/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/app/generated_resources.grd ('k') | chrome/browser/android/banners/app_banner_manager_android.cc » ('j') | content/browser/BUILD.gn » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/BUILD.gn
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index d1447cb90a006ad77b6c59f5057447d69f5492e9..18a55c87ee420944fa548d3c3ca90bc5914798d2 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -244,6 +244,284 @@ source_set("browser") {
sources += rebase_path(gypi_values.chrome_browser_web_resource_sources,
".",
"//chrome")
+# if (use_aura) {
+# sources += [
+# "android/chrome_main_delegate_staging_android.cc",
+# "android/chrome_main_delegate_staging_android.h",
+# "android/chrome_media_client_android.cc",
+# "android/chrome_media_client_android.h",
+# "android/chrome_startup_flags.cc",
+# "android/chrome_startup_flags.h",
+# "android/chrome_web_contents_delegate_android.cc",
+# "android/chrome_web_contents_delegate_android.h",
+# ]
+# }
+
+ if (!is_android || !use_aura) {
+ sources -= [ "fullscreen_auraandroid.cc", ]
+ }
+ if (is_android && use_aura) {
+ # chrome_browser_non_ios_sources
+ sources -= [
+ "android/accessibility/font_size_prefs_android.cc",
+ "android/accessibility/font_size_prefs_android.h",
+ "android/accessibility_util.cc",
+ "android/accessibility_util.h",
+# "android/activity_type_ids.cc",
+# "android/activity_type_ids.h",
+ "android/appmenu/app_menu_drag_helper.cc",
+ "android/appmenu/app_menu_drag_helper.h",
+ "android/banners/app_banner_data_fetcher_android.cc",
+ "android/banners/app_banner_data_fetcher_android.h",
+ "android/banners/app_banner_infobar_delegate_android.cc",
+ "android/banners/app_banner_infobar_delegate_android.h",
+ "android/banners/app_banner_manager_android.cc",
+ "android/banners/app_banner_manager_android.h",
+ "android/bookmarks/bookmarks_bridge.cc",
+ "android/bookmarks/bookmarks_bridge.h",
+ "android/bookmarks/edit_bookmark_helper.cc",
+ "android/bookmarks/edit_bookmark_helper.h",
+ "android/bookmarks/partner_bookmarks_reader.cc",
+ "android/bookmarks/partner_bookmarks_reader.h",
+ "android/bookmarks/partner_bookmarks_shim.cc",
+ "android/bookmarks/partner_bookmarks_shim.h",
+## "android/chrome_application.cc",
+## "android/chrome_application.h",
+## "android/chrome_jni_registrar.cc",
+## "android/chrome_jni_registrar.h",
+## "android/chrome_main_delegate_staging_android.cc",
+## "android/chrome_main_delegate_staging_android.h",
+## "android/chrome_media_client_android.cc",
+## "android/chrome_media_client_android.h",
+## "android/chrome_startup_flags.cc",
+## "android/chrome_startup_flags.h",
+ "android/chrome_web_contents_delegate_android.cc",
+ "android/chrome_web_contents_delegate_android.h",
+ "android/compositor/compositor_view.cc",
+ "android/compositor/compositor_view.h",
+ "android/compositor/decoration_title.cc",
+ "android/compositor/decoration_title.h",
+ "android/compositor/layer/content_layer.cc",
+ "android/compositor/layer/content_layer.h",
+ "android/compositor/layer/contextual_search_layer.cc",
+ "android/compositor/layer/contextual_search_layer.h",
+ "android/compositor/layer/layer.h",
+ "android/compositor/layer/reader_mode_layer.cc",
+ "android/compositor/layer/reader_mode_layer.h",
+ "android/compositor/layer/tab_handle_layer.cc",
+ "android/compositor/layer/tab_handle_layer.h",
+ "android/compositor/layer/tab_layer.cc",
+ "android/compositor/layer/tab_layer.h",
+ "android/compositor/layer/throbber_layer.cc",
+ "android/compositor/layer/throbber_layer.h",
+ "android/compositor/layer/thumbnail_layer.cc",
+ "android/compositor/layer/thumbnail_layer.h",
+ "android/compositor/layer/toolbar_layer.cc",
+ "android/compositor/layer/toolbar_layer.h",
+ "android/compositor/layer_title_cache.cc",
+ "android/compositor/layer_title_cache.h",
+ "android/compositor/scene_layer/contextual_search_scene_layer.cc",
+ "android/compositor/scene_layer/contextual_search_scene_layer.h",
+ "android/compositor/scene_layer/reader_mode_scene_layer.cc",
+ "android/compositor/scene_layer/reader_mode_scene_layer.h",
+ "android/compositor/scene_layer/scene_layer.cc",
+ "android/compositor/scene_layer/scene_layer.h",
+ "android/compositor/scene_layer/static_tab_scene_layer.cc",
+ "android/compositor/scene_layer/static_tab_scene_layer.h",
+ "android/compositor/scene_layer/tab_list_scene_layer.cc",
+ "android/compositor/scene_layer/tab_list_scene_layer.h",
+ "android/compositor/scene_layer/tab_strip_scene_layer.cc",
+ "android/compositor/scene_layer/tab_strip_scene_layer.h",
+ "android/compositor/tab_content_manager.cc",
+ "android/compositor/tab_content_manager.h",
+ "android/contextualsearch/contextual_search_context.cc",
+ "android/contextualsearch/contextual_search_context.h",
+ "android/contextualsearch/contextual_search_delegate.cc",
+ "android/contextualsearch/contextual_search_delegate.h",
+ "android/contextualsearch/contextual_search_manager.cc",
+ "android/contextualsearch/contextual_search_manager.h",
+ "android/contextualsearch/contextual_search_tab_helper.cc",
+ "android/contextualsearch/contextual_search_tab_helper.h",
+# "android/cookies/cookies_fetcher.cc",
+# "android/cookies/cookies_fetcher.h",
+# "android/dev_tools_discovery_provider_android.cc",
+# "android/dev_tools_discovery_provider_android.h",
+ "android/dev_tools_server.cc",
+ "android/dev_tools_server.h",
+ "android/document/document_web_contents_delegate.cc",
+ "android/dom_distiller/external_feedback_reporter_android.cc",
+ "android/dom_distiller/external_feedback_reporter_android.h",
+ "android/download/android_download_manager_overwrite_infobar_delegate.cc",
+ "android/download/android_download_manager_overwrite_infobar_delegate.h",
+ "android/download/chrome_download_delegate.cc",
+ "android/download/chrome_download_delegate.h",
+ "android/download/chrome_download_manager_overwrite_infobar_delegate.cc",
+ "android/download/chrome_download_manager_overwrite_infobar_delegate.h",
+ "android/download/download_overwrite_infobar_delegate.cc",
+ "android/download/download_overwrite_infobar_delegate.h",
+ "android/download/mock_download_controller_android.cc",
+ "android/download/mock_download_controller_android.h",
+ "android/favicon_helper.cc",
+ "android/favicon_helper.h",
+# "android/feature_utilities.cc",
+# "android/feature_utilities.h",
+ "android/feedback/connectivity_checker.cc",
+ "android/feedback/connectivity_checker.h",
+ "android/find_in_page/find_in_page_bridge.cc",
+ "android/find_in_page/find_in_page_bridge.h",
+ "android/foreign_session_helper.cc",
+ "android/foreign_session_helper.h",
+ "android/fullscreen/fullscreen_infobar_delegate.cc",
+ "android/fullscreen/fullscreen_infobar_delegate.h",
+ "android/history_report/data_observer.cc",
+ "android/history_report/data_observer.h",
+ "android/history_report/data_provider.cc",
+ "android/history_report/data_provider.h",
+ "android/history_report/delta_file_backend_leveldb.cc",
+ "android/history_report/delta_file_backend_leveldb.h",
+ "android/history_report/delta_file_commons.cc",
+ "android/history_report/delta_file_commons.h",
+ "android/history_report/delta_file_service.cc",
+ "android/history_report/delta_file_service.h",
+ "android/history_report/get_all_urls_from_history_task.cc",
+ "android/history_report/get_all_urls_from_history_task.h",
+ "android/history_report/historic_visits_migration_task.cc",
+ "android/history_report/historic_visits_migration_task.h",
+ "android/history_report/history_report_jni_bridge.cc",
+ "android/history_report/history_report_jni_bridge.h",
+ "android/history_report/usage_report_util.cc",
+ "android/history_report/usage_report_util.h",
+ "android/history_report/usage_reports_buffer_backend.cc",
+ "android/history_report/usage_reports_buffer_backend.h",
+ "android/history_report/usage_reports_buffer_service.cc",
+ "android/history_report/usage_reports_buffer_service.h",
+# "android/intent_helper.cc",
+# "android/intent_helper.h",
+ "android/intercept_download_resource_throttle.cc",
+ "android/intercept_download_resource_throttle.h",
+# "android/java_exception_reporter.cc",
+# "android/java_exception_reporter.h",
+ "android/large_icon_bridge.cc",
+ "android/large_icon_bridge.h",
+# "android/location_settings.h",
+# "android/location_settings_impl.cc",
+# "android/location_settings_impl.h",
+# "android/logo_bridge.cc",
+# "android/logo_bridge.h",
+# "android/logo_service.cc",
+# "android/logo_service.h",
+# "android/metrics/launch_metrics.cc",
+# "android/metrics/launch_metrics.h",
+# "android/metrics/uma_session_stats.cc",
+# "android/metrics/uma_session_stats.h",
+ "android/metrics/uma_utils.cc",
+ "android/metrics/uma_utils.h",
+# "android/metrics/variations_session.cc",
+# "android/metrics/variations_session.h",
+# "android/most_visited_sites.cc",
+# "android/most_visited_sites.h",
+# "android/net/network_quality_provider.cc",
+# "android/net/network_quality_provider.h",
+ "android/new_tab_page_prefs.cc",
+ "android/new_tab_page_prefs.h",
+ "android/new_tab_page_url_handler.cc",
+ "android/new_tab_page_url_handler.h",
+ "android/omnibox/answers_image_bridge.cc",
+ "android/omnibox/answers_image_bridge.h",
+ "android/omnibox/autocomplete_controller_android.cc",
+ "android/omnibox/autocomplete_controller_android.h",
+ "android/omnibox/omnibox_prerender.cc",
+ "android/omnibox/omnibox_prerender.h",
+ "android/password_ui_view_android.cc",
+ "android/password_ui_view_android.h",
+# "android/popular_sites.cc",
+# "android/popular_sites.h",
+# "android/precache/precache_launcher.cc",
+# "android/precache/precache_launcher.h",
+ "android/preferences/autofill/autofill_profile_bridge.cc",
+ "android/preferences/autofill/autofill_profile_bridge.h",
+ "android/preferences/pref_service_bridge.cc",
+ "android/preferences/pref_service_bridge.h",
+ "android/preferences/website_preference_bridge.cc",
+ "android/preferences/website_preference_bridge.h",
+ "android/profiles/profile_downloader_android.cc",
+ "android/profiles/profile_downloader_android.h",
+ "android/provider/blocking_ui_thread_async_request.cc",
+ "android/provider/blocking_ui_thread_async_request.h",
+ "android/provider/bookmark_model_observer_task.cc",
+ "android/provider/bookmark_model_observer_task.h",
+ "android/provider/chrome_browser_provider.cc",
+ "android/provider/chrome_browser_provider.h",
+ "android/provider/run_on_ui_thread_blocking.h",
+ "android/recently_closed_tabs_bridge.cc",
+ "android/recently_closed_tabs_bridge.h",
+# "android/resource_id.h",
+# "android/resource_mapper.cc",
+# "android/resource_mapper.h",
+# "android/rlz/revenue_stats.cc",
+# "android/rlz/revenue_stats.h",
+# "android/seccomp_support_detector.cc",
+# "android/seccomp_support_detector.h",
+# "android/shortcut_data_fetcher.cc",
+# "android/shortcut_data_fetcher.h",
+# "android/shortcut_helper.cc",
+# "android/shortcut_helper.h",
+# "android/shortcut_info.cc",
+# "android/shortcut_info.h",
+# "android/signin/account_management_screen_helper.cc",
+# "android/signin/account_management_screen_helper.h",
+ "android/signin/signin_manager_android.cc",
+ "android/signin/signin_manager_android.h",
+ "android/tab/thumbnail_tab_helper_android.cc",
+ "android/tab/thumbnail_tab_helper_android.h",
+# "android/tab_android.cc",
+# "android/tab_android.h",
+ "android/tab_state.cc",
+ "android/tab_state.h",
+ "android/thumbnail/thumbnail.cc",
+ "android/thumbnail/thumbnail.h",
+ "android/thumbnail/thumbnail_cache.cc",
+ "android/thumbnail/thumbnail_cache.h",
+# "android/url_utilities.cc",
+# "android/url_utilities.h",
+ "android/voice_search_tab_helper.cc",
+ "android/voice_search_tab_helper.h",
+ "android/warmup_manager.cc",
+ "android/warmup_manager.h",
+ "android/web_contents_factory.cc",
+ "android/web_contents_factory.h",
+ "android/webapps/single_tab_mode_tab_helper.cc",
+ "android/webapps/single_tab_mode_tab_helper.h",
+
+ "platform_util_android.cc",
+ ]
+
+ deps += [ "//ui/platform_window/android", ]
+
+ # chrome_browser_sync_sources
+ sources -= [
+ "sync/glue/synced_tab_delegate_android.cc",
+ "sync/glue/synced_tab_delegate_android.h",
+ "sync/glue/synced_window_delegate.h",
+ "sync/glue/synced_window_delegate_android.cc",
+ "sync/glue/synced_window_delegate_android.h",
+ ]
+
+ # chrome_browser_session_sources
+ sources -= [ "sessions/session_restore_android.cc", ]
+
+ sources +=
+ rebase_path(gypi_values.chrome_browser_linux_sources, ".", "//chrome")
+
+ sources += [
+ "../../ui/aura/test/test_focus_client.cc",
+ "../../ui/aura/test/test_focus_client.h",
+ "../../ui/wm/android/android_focus_rules.cc",
+ "../../ui/wm/android/android_focus_rules.h",
+ "../../ui/wm/test/wm_test_helper.cc",
+ "../../ui/wm/test/wm_test_helper.h",
+ ]
+ }
deps += [
"//apps",
@@ -418,7 +696,12 @@ source_set("browser") {
".",
"//chrome")
}
- if (is_android || is_ios) {
+ if (is_android && use_aura) {
+ sources += rebase_path(gypi_values.chrome_browser_policy_desktop_sources,
+ ".",
+ "//chrome")
+ }
+ if ((is_android && !use_aura) || is_ios) {
sources += rebase_path(gypi_values.chrome_browser_policy_mobile_sources,
".",
"//chrome")
@@ -568,12 +851,19 @@ source_set("browser") {
sources += rebase_path(gypi_values.chrome_browser_notifications_sources,
".",
"//chrome")
- if (!is_android) {
+ if (!is_android || use_aura) {
sources += rebase_path(
gypi_values.chrome_browser_notifications_non_android_sources,
".",
"//chrome")
}
+
+ if (is_android && use_aura) {
+ sources -= [
+ "notifications/notification_ui_manager_android.cc",
+ "notifications/notification_ui_manager_android.h",
+ ]
+ }
}
if (enable_themes) {
sources +=
@@ -617,6 +907,12 @@ source_set("browser") {
sources += rebase_path(gypi_values.chrome_browser_session_service_sources,
".",
"//chrome")
+ if (is_android && use_aura) {
+ sources -= [
+ "sessions/persistent_tab_restore_service.cc",
+ "sessions/persistent_tab_restore_service.h",
+ ]
+ }
}
if (!is_android && !is_ios && !is_chromeos) {
@@ -624,21 +920,42 @@ source_set("browser") {
rebase_path(gypi_values.chrome_browser_desktop_sources, ".", "//chrome")
}
+ if (is_android && use_aura) {
+ sources +=
+ rebase_path(gypi_values.chrome_browser_desktop_sources, ".", "//chrome")
+ }
+
if (is_android || is_ios) {
# Mobile.
sources +=
rebase_path(gypi_values.chrome_browser_mobile_sources, ".", "//chrome")
} else {
+ deps += [
+ # TODO(mfomitchev): not sure if this is needed for Android Aura?
+ "//device/core",
+ "//device/devices_app/public/cpp",
+ "//device/devices_app/public/cpp:factory",
+ "//device/usb",
+ ]
+ }
+
+ if ((!is_ios && !is_android) || use_aura) {
# Non-mobile.
sources += rebase_path(gypi_values.chrome_browser_non_mobile_sources,
".",
"//chrome")
+
+ if (is_android) {
+ sources -= [
+ "download/download_crx_util.cc",
+ "ssl/ssl_add_certificate.cc",
+ "net/utility_process_mojo_proxy_resolver_factory.cc",
+ "net/utility_process_mojo_proxy_resolver_factory.h",
+ ]
+ }
+
deps += [
"//components/feedback",
- "//device/core",
- "//device/devices_app/public/cpp",
- "//device/devices_app/public/cpp:factory",
- "//device/usb",
]
}
@@ -682,6 +999,16 @@ source_set("browser") {
defines += [ "USE_SECCOMP_BPF" ]
deps += [ "//sandbox/linux:seccomp_bpf" ]
}
+
+ if (use_aura) {
+ deps -= [
+ "//components/web_contents_delegate_android",
+ "//third_party/libaddressinput:util",
+ ]
+ deps += [
+ "//third_party/libaddressinput",
+ ]
+ }
}
if (is_mac) {
@@ -795,6 +1122,14 @@ source_set("browser") {
sources += rebase_path(gypi_values.chrome_browser_supervised_user_sources,
".",
"//chrome")
+ if (is_android && use_aura) {
+ sources -= [
+ "supervised_user/child_accounts/child_account_feedback_reporter_android.cc",
+ "supervised_user/child_accounts/child_account_feedback_reporter_android.h",
+ "supervised_user/child_accounts/child_account_service_android.cc",
+ "supervised_user/child_accounts/child_account_service_android.h",
+ ]
+ }
}
if (enable_supervised_users && !is_android && !is_ios) {
sources +=
@@ -821,7 +1156,7 @@ source_set("browser") {
sources +=
rebase_path(gypi_values.chrome_browser_mdns_sources, ".", "//chrome")
}
- if (!enable_autofill_dialog || is_android || is_ios) {
+ if (!enable_autofill_dialog || is_android && !use_aura || is_ios) {
sources -= [
"autofill/validation_rules_storage_factory.cc",
"autofill/validation_rules_storage_factory.h",
@@ -851,6 +1186,13 @@ if (is_android) {
generate_jni("jni_headers") {
sources =
rebase_path(gypi_values.chrome_browser_jni_sources, ".", "//chrome")
+ if (use_aura) {
+ sources -= [ "../android/java/src/org/chromium/chrome/browser/preferences/LocationSettings.java",
+ "../android/java/src/org/chromium/chrome/browser/toolbar/ToolbarModel.java",
+ "../android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManager.java",
+ "../android/java/src/org/chromium/chrome/browser/ChromeWebContentsDelegateAndroid.java",
+ ]
+ }
jni_package = "chrome"
}
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/android/banners/app_banner_manager_android.cc » ('j') | content/browser/BUILD.gn » ('J')

Powered by Google App Engine
This is Rietveld 408576698