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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/chrome_browser.gypi

Issue 1459793002: Android: Allow compiling browser without Java UI (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years 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/ui/webui/net_export_ui.cc ('k') | chrome/chrome_browser_ui.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_browser.gypi
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index e76071b841f251cc2a9036150efd55c6b45cf034..df433200aa7230c72866f0fd1a8c4e09dae852b5 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -22,270 +22,12 @@
'browser/about_flags.h',
'browser/after_startup_task_utils.cc',
'browser/after_startup_task_utils.h',
- 'browser/after_startup_task_utils_android.cc',
- 'browser/after_startup_task_utils_android.h',
- 'browser/android/accessibility/font_size_prefs_android.cc',
- 'browser/android/accessibility/font_size_prefs_android.h',
- 'browser/android/accessibility_util.cc',
- 'browser/android/accessibility_util.h',
- 'browser/android/activity_type_ids.cc',
- 'browser/android/activity_type_ids.h',
- 'browser/android/android_theme_resources.h',
- 'browser/android/appmenu/app_menu_drag_helper.cc',
- 'browser/android/appmenu/app_menu_drag_helper.h',
- 'browser/android/banners/app_banner_data_fetcher_android.cc',
- 'browser/android/banners/app_banner_data_fetcher_android.h',
- 'browser/android/banners/app_banner_infobar_delegate_android.cc',
- 'browser/android/banners/app_banner_infobar_delegate_android.h',
- 'browser/android/banners/app_banner_manager_android.cc',
- 'browser/android/banners/app_banner_manager_android.h',
- 'browser/android/bookmarks/bookmarks_bridge.cc',
- 'browser/android/bookmarks/bookmarks_bridge.h',
- 'browser/android/bookmarks/edit_bookmark_helper.cc',
- 'browser/android/bookmarks/edit_bookmark_helper.h',
- 'browser/android/bookmarks/partner_bookmarks_reader.cc',
- 'browser/android/bookmarks/partner_bookmarks_reader.h',
- 'browser/android/bookmarks/partner_bookmarks_shim.cc',
- 'browser/android/bookmarks/partner_bookmarks_shim.h',
- 'browser/android/bottombar/overlay_panel_content.cc',
- 'browser/android/bottombar/overlay_panel_content.h',
- 'browser/android/chrome_application.cc',
- 'browser/android/chrome_application.h',
- 'browser/android/chrome_jni_registrar.cc',
- 'browser/android/chrome_jni_registrar.h',
- 'browser/android/chrome_media_client_android.cc',
- 'browser/android/chrome_media_client_android.h',
- 'browser/android/chrome_startup_flags.cc',
- 'browser/android/chrome_startup_flags.h',
- 'browser/android/compositor/compositor_view.cc',
- 'browser/android/compositor/compositor_view.h',
- 'browser/android/compositor/decoration_title.cc',
- 'browser/android/compositor/decoration_title.h',
- 'browser/android/compositor/layer/content_layer.cc',
- 'browser/android/compositor/layer/content_layer.h',
- 'browser/android/compositor/layer/contextual_search_layer.cc',
- 'browser/android/compositor/layer/contextual_search_layer.h',
- 'browser/android/compositor/layer/crushed_sprite_layer.cc',
- 'browser/android/compositor/layer/crushed_sprite_layer.h',
- 'browser/android/compositor/layer/layer.h',
- 'browser/android/compositor/layer/tab_handle_layer.cc',
- 'browser/android/compositor/layer/tab_handle_layer.h',
- 'browser/android/compositor/layer/tab_layer.cc',
- 'browser/android/compositor/layer/tab_layer.h',
- 'browser/android/compositor/layer/thumbnail_layer.cc',
- 'browser/android/compositor/layer/thumbnail_layer.h',
- 'browser/android/compositor/layer/toolbar_layer.cc',
- 'browser/android/compositor/layer/toolbar_layer.h',
- 'browser/android/compositor/layer_title_cache.cc',
- 'browser/android/compositor/layer_title_cache.h',
- 'browser/android/compositor/scene_layer/contextual_search_scene_layer.cc',
- 'browser/android/compositor/scene_layer/contextual_search_scene_layer.h',
- 'browser/android/compositor/scene_layer/scene_layer.cc',
- 'browser/android/compositor/scene_layer/scene_layer.h',
- 'browser/android/compositor/scene_layer/static_tab_scene_layer.cc',
- 'browser/android/compositor/scene_layer/static_tab_scene_layer.h',
- 'browser/android/compositor/scene_layer/tab_list_scene_layer.cc',
- 'browser/android/compositor/scene_layer/tab_list_scene_layer.h',
- 'browser/android/compositor/scene_layer/tab_strip_scene_layer.cc',
- 'browser/android/compositor/scene_layer/tab_strip_scene_layer.h',
- 'browser/android/compositor/tab_content_manager.cc',
- 'browser/android/compositor/tab_content_manager.h',
- 'browser/android/contextualsearch/contextual_search_context.cc',
- 'browser/android/contextualsearch/contextual_search_context.h',
- 'browser/android/contextualsearch/contextual_search_delegate.cc',
- 'browser/android/contextualsearch/contextual_search_delegate.h',
- 'browser/android/contextualsearch/contextual_search_manager.cc',
- 'browser/android/contextualsearch/contextual_search_manager.h',
- 'browser/android/contextualsearch/contextual_search_tab_helper.cc',
- 'browser/android/contextualsearch/contextual_search_tab_helper.h',
- 'browser/android/contextualsearch/resolved_search_term.cc',
- 'browser/android/contextualsearch/resolved_search_term.h',
- 'browser/android/cookies/cookies_fetcher.cc',
- 'browser/android/cookies/cookies_fetcher.h',
- 'browser/android/data_usage/data_use_tab_helper.cc',
- 'browser/android/data_usage/data_use_tab_helper.h',
- 'browser/android/data_usage/data_use_tab_model.cc',
- 'browser/android/data_usage/data_use_tab_model.h',
- 'browser/android/data_usage/data_use_ui_tab_model.cc',
- 'browser/android/data_usage/data_use_ui_tab_model.h',
- 'browser/android/data_usage/data_use_ui_tab_model_factory.cc',
- 'browser/android/data_usage/data_use_ui_tab_model_factory.h',
- 'browser/android/data_usage/external_data_use_observer.cc',
- 'browser/android/data_usage/external_data_use_observer.h',
- 'browser/android/data_usage/tab_data_use_entry.cc',
- 'browser/android/data_usage/tab_data_use_entry.h',
- 'browser/android/dev_tools_discovery_provider_android.cc',
- 'browser/android/dev_tools_discovery_provider_android.h',
- 'browser/android/dev_tools_server.cc',
- 'browser/android/dev_tools_server.h',
- 'browser/android/document/document_web_contents_delegate.cc',
- 'browser/android/dom_distiller/distiller_ui_handle_android.cc',
- 'browser/android/dom_distiller/distiller_ui_handle_android.h',
- 'browser/android/download/android_download_manager_overwrite_infobar_delegate.cc',
- 'browser/android/download/android_download_manager_overwrite_infobar_delegate.h',
- 'browser/android/download/chrome_download_delegate.cc',
- 'browser/android/download/chrome_download_delegate.h',
- 'browser/android/download/chrome_download_manager_overwrite_infobar_delegate.cc',
- 'browser/android/download/chrome_download_manager_overwrite_infobar_delegate.h',
- 'browser/android/download/download_overwrite_infobar_delegate.cc',
- 'browser/android/download/download_overwrite_infobar_delegate.h',
- 'browser/android/download/mock_download_controller_android.cc',
- 'browser/android/download/mock_download_controller_android.h',
- 'browser/android/favicon_helper.cc',
- 'browser/android/favicon_helper.h',
- 'browser/android/feature_utilities.cc',
- 'browser/android/feature_utilities.h',
- 'browser/android/feedback/connectivity_checker.cc',
- 'browser/android/feedback/connectivity_checker.h',
- 'browser/android/feedback/screenshot_task.cc',
- 'browser/android/feedback/screenshot_task.h',
- 'browser/android/find_in_page/find_in_page_bridge.cc',
- 'browser/android/find_in_page/find_in_page_bridge.h',
- 'browser/android/foreign_session_helper.cc',
- 'browser/android/foreign_session_helper.h',
- 'browser/android/fullscreen/fullscreen_infobar_delegate.cc',
- 'browser/android/fullscreen/fullscreen_infobar_delegate.h',
- 'browser/android/history_report/data_observer.cc',
- 'browser/android/history_report/data_observer.h',
- 'browser/android/history_report/data_provider.cc',
- 'browser/android/history_report/data_provider.h',
- 'browser/android/history_report/delta_file_backend_leveldb.cc',
- 'browser/android/history_report/delta_file_backend_leveldb.h',
- 'browser/android/history_report/delta_file_commons.cc',
- 'browser/android/history_report/delta_file_commons.h',
- 'browser/android/history_report/delta_file_service.cc',
- 'browser/android/history_report/delta_file_service.h',
- 'browser/android/history_report/get_all_urls_from_history_task.cc',
- 'browser/android/history_report/get_all_urls_from_history_task.h',
- 'browser/android/history_report/historic_visits_migration_task.cc',
- 'browser/android/history_report/historic_visits_migration_task.h',
- 'browser/android/history_report/history_report_jni_bridge.cc',
- 'browser/android/history_report/history_report_jni_bridge.h',
- 'browser/android/history_report/usage_report_util.cc',
- 'browser/android/history_report/usage_report_util.h',
- 'browser/android/history_report/usage_reports_buffer_backend.cc',
- 'browser/android/history_report/usage_reports_buffer_backend.h',
- 'browser/android/history_report/usage_reports_buffer_service.cc',
- 'browser/android/history_report/usage_reports_buffer_service.h',
- 'browser/android/hung_renderer_infobar_delegate.cc',
- 'browser/android/hung_renderer_infobar_delegate.h',
- 'browser/android/intent_helper.cc',
- 'browser/android/intent_helper.h',
- 'browser/android/intercept_download_resource_throttle.cc',
- 'browser/android/intercept_download_resource_throttle.h',
- 'browser/android/java_exception_reporter.cc',
- 'browser/android/java_exception_reporter.h',
- 'browser/android/large_icon_bridge.cc',
- 'browser/android/large_icon_bridge.h',
- 'browser/android/location_settings.h',
- 'browser/android/location_settings_impl.cc',
- 'browser/android/location_settings_impl.h',
- 'browser/android/logo_bridge.cc',
- 'browser/android/logo_bridge.h',
- 'browser/android/logo_service.cc',
- 'browser/android/logo_service.h',
- 'browser/android/media/media_throttle_infobar_delegate.cc',
- 'browser/android/media/media_throttle_infobar_delegate.h',
- 'browser/android/metrics/launch_metrics.cc',
- 'browser/android/metrics/launch_metrics.h',
- 'browser/android/metrics/uma_session_stats.cc',
- 'browser/android/metrics/uma_session_stats.h',
- 'browser/android/metrics/uma_utils.cc',
- 'browser/android/metrics/uma_utils.h',
- 'browser/android/metrics/variations_session.cc',
- 'browser/android/metrics/variations_session.h',
- 'browser/android/most_visited_sites.cc',
- 'browser/android/most_visited_sites.h',
- 'browser/android/net/external_estimate_provider_android.cc',
- 'browser/android/net/external_estimate_provider_android.h',
- 'browser/android/new_tab_page_prefs.cc',
- 'browser/android/new_tab_page_prefs.h',
- 'browser/android/new_tab_page_url_handler.cc',
- 'browser/android/new_tab_page_url_handler.h',
- 'browser/android/omnibox/answers_image_bridge.cc',
- 'browser/android/omnibox/answers_image_bridge.h',
- 'browser/android/omnibox/autocomplete_controller_android.cc',
- 'browser/android/omnibox/autocomplete_controller_android.h',
- 'browser/android/omnibox/omnibox_prerender.cc',
- 'browser/android/omnibox/omnibox_prerender.h',
- 'browser/android/password_ui_view_android.cc',
- 'browser/android/password_ui_view_android.h',
- 'browser/android/popular_sites.cc',
- 'browser/android/popular_sites.h',
- 'browser/android/precache/precache_launcher.cc',
- 'browser/android/precache/precache_launcher.h',
- 'browser/android/preferences/autofill/autofill_profile_bridge.cc',
- 'browser/android/preferences/autofill/autofill_profile_bridge.h',
- 'browser/android/preferences/pref_service_bridge.cc',
- 'browser/android/preferences/pref_service_bridge.h',
- 'browser/android/preferences/website_preference_bridge.cc',
- 'browser/android/preferences/website_preference_bridge.h',
- 'browser/android/profiles/profile_downloader_android.cc',
- 'browser/android/profiles/profile_downloader_android.h',
- 'browser/android/provider/blocking_ui_thread_async_request.cc',
- 'browser/android/provider/blocking_ui_thread_async_request.h',
- 'browser/android/provider/bookmark_model_observer_task.cc',
- 'browser/android/provider/bookmark_model_observer_task.h',
- 'browser/android/provider/chrome_browser_provider.cc',
- 'browser/android/provider/chrome_browser_provider.h',
- 'browser/android/provider/run_on_ui_thread_blocking.h',
- 'browser/android/rappor/rappor_service_bridge.cc',
- 'browser/android/rappor/rappor_service_bridge.h',
- 'browser/android/recently_closed_tabs_bridge.cc',
- 'browser/android/recently_closed_tabs_bridge.h',
- 'browser/android/resource_id.h',
- 'browser/android/resource_mapper.cc',
- 'browser/android/resource_mapper.h',
- 'browser/android/rlz/revenue_stats.cc',
- 'browser/android/rlz/revenue_stats.h',
- 'browser/android/seccomp_support_detector.cc',
- 'browser/android/seccomp_support_detector.h',
- 'browser/android/sessions/session_tab_helper_android.cc',
- 'browser/android/sessions/session_tab_helper_android.h',
- 'browser/android/shortcut_helper.cc',
- 'browser/android/shortcut_helper.h',
- 'browser/android/shortcut_info.cc',
- 'browser/android/shortcut_info.h',
- 'browser/android/signin/account_management_screen_helper.cc',
- 'browser/android/signin/account_management_screen_helper.h',
- 'browser/android/signin/account_tracker_service_android.cc',
- 'browser/android/signin/account_tracker_service_android.h',
- 'browser/android/signin/signin_manager_android.cc',
- 'browser/android/signin/signin_manager_android.h',
- 'browser/android/tab_android.cc',
- 'browser/android/tab_android.h',
- 'browser/android/tab_state.cc',
- 'browser/android/tab_state.h',
- 'browser/android/tab_web_contents_delegate_android.cc',
- 'browser/android/tab_web_contents_delegate_android.h',
- 'browser/android/thumbnail/thumbnail.cc',
- 'browser/android/thumbnail/thumbnail.h',
- 'browser/android/thumbnail/thumbnail_cache.cc',
- 'browser/android/thumbnail/thumbnail_cache.h',
- 'browser/android/url_utilities.cc',
- 'browser/android/url_utilities.h',
- 'browser/android/voice_search_tab_helper.cc',
- 'browser/android/voice_search_tab_helper.h',
- 'browser/android/warmup_manager.cc',
- 'browser/android/warmup_manager.h',
- 'browser/android/web_contents_factory.cc',
- 'browser/android/web_contents_factory.h',
- 'browser/android/webapps/add_to_homescreen_data_fetcher.cc',
- 'browser/android/webapps/add_to_homescreen_data_fetcher.h',
- 'browser/android/webapps/add_to_homescreen_dialog_helper.cc',
- 'browser/android/webapps/add_to_homescreen_dialog_helper.h',
- 'browser/android/webapps/single_tab_mode_tab_helper.cc',
- 'browser/android/webapps/single_tab_mode_tab_helper.h',
- 'browser/android/webapps/webapp_registry.cc',
- 'browser/android/webapps/webapp_registry.h',
'browser/app_controller_mac.h',
'browser/app_controller_mac.mm',
'browser/app_icon_win.cc',
'browser/app_icon_win.h',
'browser/app_mode/app_mode_utils.cc',
'browser/app_mode/app_mode_utils.h',
- 'browser/autofill/android/personal_data_manager_android.cc',
- 'browser/autofill/android/personal_data_manager_android.h',
'browser/autofill/options_util.cc',
'browser/autofill/options_util.h',
'browser/autofill/personal_data_manager_factory.cc',
@@ -434,16 +176,12 @@
'browser/defaults.h',
'browser/dom_distiller/dom_distiller_service_factory.cc',
'browser/dom_distiller/dom_distiller_service_factory.h',
- 'browser/dom_distiller/dom_distiller_service_factory_android.cc',
- 'browser/dom_distiller/dom_distiller_service_factory_android.h',
'browser/dom_distiller/lazy_dom_distiller_service.cc',
'browser/dom_distiller/lazy_dom_distiller_service.h',
'browser/dom_distiller/profile_utils.cc',
'browser/dom_distiller/profile_utils.h',
'browser/dom_distiller/tab_utils.cc',
'browser/dom_distiller/tab_utils.h',
- 'browser/dom_distiller/tab_utils_android.cc',
- 'browser/dom_distiller/tab_utils_android.h',
'browser/domain_reliability/service_factory.cc',
'browser/domain_reliability/service_factory.h',
'browser/download/all_download_item_notifier.cc',
@@ -561,8 +299,6 @@
'browser/install_verification/win/module_list.h',
'browser/install_verification/win/module_verification_common.cc',
'browser/install_verification/win/module_verification_common.h',
- 'browser/interests/android/interests_service.cc',
- 'browser/interests/android/interests_service.h',
'browser/interests/interests_fetcher.cc',
'browser/interests/interests_fetcher.h',
'browser/internal_auth.cc',
@@ -575,8 +311,6 @@
'browser/interstitials/security_interstitial_page.h',
'browser/intranet_redirect_detector.cc',
'browser/intranet_redirect_detector.h',
- 'browser/invalidation/invalidation_service_factory_android.cc',
- 'browser/invalidation/invalidation_service_factory_android.h',
'browser/invalidation/profile_invalidation_provider_factory.cc',
'browser/invalidation/profile_invalidation_provider_factory.h',
'browser/io_thread.cc',
@@ -587,8 +321,6 @@
'browser/jumplist_win.h',
'browser/lifetime/application_lifetime.cc',
'browser/lifetime/application_lifetime.h',
- 'browser/lifetime/application_lifetime_android.cc',
- 'browser/lifetime/application_lifetime_android.h',
'browser/lifetime/application_lifetime_mac.mm',
'browser/lifetime/application_lifetime_win.cc',
'browser/mac/bluetooth_utility.h',
@@ -613,18 +345,6 @@
'browser/manifest/manifest_icon_downloader.h',
'browser/manifest/manifest_icon_selector.cc',
'browser/manifest/manifest_icon_selector.h',
- 'browser/media/android/cdm/media_drm_credential_manager.cc',
- 'browser/media/android/cdm/media_drm_credential_manager.h',
- 'browser/media/android/remote/record_cast_action.cc',
- 'browser/media/android/remote/record_cast_action.h',
- 'browser/media/android/remote/remote_media_player_bridge.cc',
- 'browser/media/android/remote/remote_media_player_bridge.h',
- 'browser/media/android/remote/remote_media_player_manager.cc',
- 'browser/media/android/remote/remote_media_player_manager.h',
- 'browser/media/android/router/media_router_android.cc',
- 'browser/media/android/router/media_router_android.h',
- 'browser/media/android/router/media_router_dialog_controller_android.cc',
- 'browser/media/android/router/media_router_dialog_controller_android.h',
'browser/media/desktop_media_list.h',
'browser/media/desktop_media_picker.h',
'browser/media/desktop_streams_registry.cc',
@@ -689,7 +409,6 @@
'browser/performance_monitor/process_metrics_history.cc',
'browser/performance_monitor/process_metrics_history.h',
'browser/platform_util.h',
- 'browser/platform_util_android.cc',
'browser/platform_util_chromeos.cc',
'browser/platform_util_internal.h',
'browser/platform_util_mac.mm',
@@ -698,8 +417,6 @@
'browser/prefetch/prefetch.h',
'browser/prefetch/prefetch_field_trial.cc',
'browser/prefetch/prefetch_field_trial.h',
- 'browser/prerender/external_prerender_handler_android.cc',
- 'browser/prerender/external_prerender_handler_android.h',
'browser/prerender/prerender_config.cc',
'browser/prerender/prerender_config.h',
'browser/prerender/prerender_contents.cc',
@@ -778,8 +495,6 @@
'browser/safe_browsing/srt_field_trial_win.h',
'browser/safe_browsing/srt_global_error_win.cc',
'browser/safe_browsing/srt_global_error_win.h',
- 'browser/search/contextual_search_policy_handler_android.cc',
- 'browser/search/contextual_search_policy_handler_android.h',
'browser/search/iframe_source.cc',
'browser/search/iframe_source.h',
'browser/search/instant_io_context.cc',
@@ -889,29 +604,316 @@
'browser/web_data_service_factory.cc',
'browser/web_data_service_factory.h',
],
+ # Android sources included regardless of android_java_ui.
'chrome_browser_android_sources': [
+ 'browser/media/protected_media_identifier_permission_context.cc',
+ 'browser/media/protected_media_identifier_permission_context.h',
+ 'browser/media/protected_media_identifier_permission_context_factory.cc',
+ 'browser/media/protected_media_identifier_permission_context_factory.h',
+ ],
+ # Browser sources used when android_java_ui is enabled.
+ 'chrome_browser_android_java_ui_sources': [
+ 'browser/after_startup_task_utils_android.cc',
+ 'browser/after_startup_task_utils_android.h',
+ 'browser/platform_util_android.cc',
+ 'browser/android/accessibility/font_size_prefs_android.cc',
+ 'browser/android/accessibility/font_size_prefs_android.h',
+ 'browser/android/accessibility_util.cc',
+ 'browser/android/accessibility_util.h',
+ 'browser/android/activity_type_ids.cc',
+ 'browser/android/activity_type_ids.h',
+ 'browser/android/android_theme_resources.h',
+ 'browser/android/appmenu/app_menu_drag_helper.cc',
+ 'browser/android/appmenu/app_menu_drag_helper.h',
'browser/android/background_sync_launcher_android.cc',
'browser/android/background_sync_launcher_android.h',
+ 'browser/android/banners/app_banner_data_fetcher_android.cc',
+ 'browser/android/banners/app_banner_data_fetcher_android.h',
+ 'browser/android/banners/app_banner_infobar_delegate_android.cc',
+ 'browser/android/banners/app_banner_infobar_delegate_android.h',
+ 'browser/android/banners/app_banner_manager_android.cc',
+ 'browser/android/banners/app_banner_manager_android.h',
+ 'browser/android/bookmarks/bookmarks_bridge.cc',
+ 'browser/android/bookmarks/bookmarks_bridge.h',
+ 'browser/android/bookmarks/edit_bookmark_helper.cc',
+ 'browser/android/bookmarks/edit_bookmark_helper.h',
+ 'browser/android/bookmarks/partner_bookmarks_reader.cc',
+ 'browser/android/bookmarks/partner_bookmarks_reader.h',
+ 'browser/android/bookmarks/partner_bookmarks_shim.cc',
+ 'browser/android/bookmarks/partner_bookmarks_shim.h',
+ 'browser/android/bottombar/overlay_panel_content.cc',
+ 'browser/android/bottombar/overlay_panel_content.h',
+ 'browser/android/chrome_application.cc',
+ 'browser/android/chrome_application.h',
+ 'browser/android/chrome_jni_registrar.cc',
+ 'browser/android/chrome_jni_registrar.h',
+ 'browser/android/chrome_media_client_android.cc',
+ 'browser/android/chrome_media_client_android.h',
+ 'browser/android/chrome_startup_flags.cc',
+ 'browser/android/chrome_startup_flags.h',
+ 'browser/android/compositor/compositor_view.cc',
+ 'browser/android/compositor/compositor_view.h',
+ 'browser/android/compositor/decoration_title.cc',
+ 'browser/android/compositor/decoration_title.h',
+ 'browser/android/compositor/layer/content_layer.cc',
+ 'browser/android/compositor/layer/content_layer.h',
+ 'browser/android/compositor/layer/contextual_search_layer.cc',
+ 'browser/android/compositor/layer/contextual_search_layer.h',
+ 'browser/android/compositor/layer/crushed_sprite_layer.cc',
+ 'browser/android/compositor/layer/crushed_sprite_layer.h',
+ 'browser/android/compositor/layer/layer.h',
+ 'browser/android/compositor/layer/tab_handle_layer.cc',
+ 'browser/android/compositor/layer/tab_handle_layer.h',
+ 'browser/android/compositor/layer/tab_layer.cc',
+ 'browser/android/compositor/layer/tab_layer.h',
+ 'browser/android/compositor/layer/thumbnail_layer.cc',
+ 'browser/android/compositor/layer/thumbnail_layer.h',
+ 'browser/android/compositor/layer/toolbar_layer.cc',
+ 'browser/android/compositor/layer/toolbar_layer.h',
+ 'browser/android/compositor/layer_title_cache.cc',
+ 'browser/android/compositor/layer_title_cache.h',
+ 'browser/android/compositor/scene_layer/contextual_search_scene_layer.cc',
+ 'browser/android/compositor/scene_layer/contextual_search_scene_layer.h',
+ 'browser/android/compositor/scene_layer/scene_layer.cc',
+ 'browser/android/compositor/scene_layer/scene_layer.h',
+ 'browser/android/compositor/scene_layer/static_tab_scene_layer.cc',
+ 'browser/android/compositor/scene_layer/static_tab_scene_layer.h',
+ 'browser/android/compositor/scene_layer/tab_list_scene_layer.cc',
+ 'browser/android/compositor/scene_layer/tab_list_scene_layer.h',
+ 'browser/android/compositor/scene_layer/tab_strip_scene_layer.cc',
+ 'browser/android/compositor/scene_layer/tab_strip_scene_layer.h',
+ 'browser/android/compositor/tab_content_manager.cc',
+ 'browser/android/compositor/tab_content_manager.h',
+ 'browser/android/contextualsearch/contextual_search_context.cc',
+ 'browser/android/contextualsearch/contextual_search_context.h',
+ 'browser/android/contextualsearch/contextual_search_delegate.cc',
+ 'browser/android/contextualsearch/contextual_search_delegate.h',
+ 'browser/android/contextualsearch/contextual_search_manager.cc',
+ 'browser/android/contextualsearch/contextual_search_manager.h',
+ 'browser/android/contextualsearch/contextual_search_tab_helper.cc',
+ 'browser/android/contextualsearch/contextual_search_tab_helper.h',
+ 'browser/android/contextualsearch/resolved_search_term.cc',
+ 'browser/android/contextualsearch/resolved_search_term.h',
+ 'browser/android/cookies/cookies_fetcher.cc',
+ 'browser/android/cookies/cookies_fetcher.h',
+ 'browser/android/data_usage/data_use_tab_helper.cc',
+ 'browser/android/data_usage/data_use_tab_helper.h',
+ 'browser/android/data_usage/data_use_tab_model.cc',
+ 'browser/android/data_usage/data_use_tab_model.h',
'browser/android/data_usage/data_use_tab_ui_manager_android.cc',
'browser/android/data_usage/data_use_tab_ui_manager_android.h',
+ 'browser/android/data_usage/data_use_ui_tab_model.cc',
+ 'browser/android/data_usage/data_use_ui_tab_model.h',
+ 'browser/android/data_usage/data_use_ui_tab_model_factory.cc',
+ 'browser/android/data_usage/data_use_ui_tab_model_factory.h',
+ 'browser/android/data_usage/external_data_use_observer.cc',
+ 'browser/android/data_usage/external_data_use_observer.h',
+ 'browser/android/data_usage/tab_data_use_entry.cc',
+ 'browser/android/data_usage/tab_data_use_entry.h',
+ 'browser/android/dev_tools_discovery_provider_android.cc',
+ 'browser/android/dev_tools_discovery_provider_android.h',
+ 'browser/android/dev_tools_server.cc',
+ 'browser/android/dev_tools_server.h',
+ 'browser/android/document/document_web_contents_delegate.cc',
+ 'browser/android/dom_distiller/distiller_ui_handle_android.cc',
+ 'browser/android/dom_distiller/distiller_ui_handle_android.h',
+ 'browser/android/download/android_download_manager_overwrite_infobar_delegate.cc',
+ 'browser/android/download/android_download_manager_overwrite_infobar_delegate.h',
+ 'browser/android/download/chrome_download_delegate.cc',
+ 'browser/android/download/chrome_download_delegate.h',
+ 'browser/android/download/chrome_download_manager_overwrite_infobar_delegate.cc',
+ 'browser/android/download/chrome_download_manager_overwrite_infobar_delegate.h',
+ 'browser/android/download/download_overwrite_infobar_delegate.cc',
+ 'browser/android/download/download_overwrite_infobar_delegate.h',
+ 'browser/android/download/mock_download_controller_android.cc',
+ 'browser/android/download/mock_download_controller_android.h',
+ 'browser/android/favicon_helper.cc',
+ 'browser/android/favicon_helper.h',
+ 'browser/android/feature_utilities.cc',
+ 'browser/android/feature_utilities.h',
+ 'browser/android/feedback/connectivity_checker.cc',
+ 'browser/android/feedback/connectivity_checker.h',
+ 'browser/android/feedback/screenshot_task.cc',
+ 'browser/android/feedback/screenshot_task.h',
+ 'browser/android/find_in_page/find_in_page_bridge.cc',
+ 'browser/android/find_in_page/find_in_page_bridge.h',
+ 'browser/android/foreign_session_helper.cc',
+ 'browser/android/foreign_session_helper.h',
+ 'browser/android/fullscreen/fullscreen_infobar_delegate.cc',
+ 'browser/android/fullscreen/fullscreen_infobar_delegate.h',
+ 'browser/android/history_report/data_observer.cc',
+ 'browser/android/history_report/data_observer.h',
+ 'browser/android/history_report/data_provider.cc',
+ 'browser/android/history_report/data_provider.h',
+ 'browser/android/history_report/delta_file_backend_leveldb.cc',
+ 'browser/android/history_report/delta_file_backend_leveldb.h',
+ 'browser/android/history_report/delta_file_commons.cc',
+ 'browser/android/history_report/delta_file_commons.h',
+ 'browser/android/history_report/delta_file_service.cc',
+ 'browser/android/history_report/delta_file_service.h',
+ 'browser/android/history_report/get_all_urls_from_history_task.cc',
+ 'browser/android/history_report/get_all_urls_from_history_task.h',
+ 'browser/android/history_report/historic_visits_migration_task.cc',
+ 'browser/android/history_report/historic_visits_migration_task.h',
+ 'browser/android/history_report/history_report_jni_bridge.cc',
+ 'browser/android/history_report/history_report_jni_bridge.h',
+ 'browser/android/history_report/usage_report_util.cc',
+ 'browser/android/history_report/usage_report_util.h',
+ 'browser/android/history_report/usage_reports_buffer_backend.cc',
+ 'browser/android/history_report/usage_reports_buffer_backend.h',
+ 'browser/android/history_report/usage_reports_buffer_service.cc',
+ 'browser/android/history_report/usage_reports_buffer_service.h',
+ 'browser/android/hung_renderer_infobar_delegate.cc',
+ 'browser/android/hung_renderer_infobar_delegate.h',
+ 'browser/android/intent_helper.cc',
+ 'browser/android/intent_helper.h',
+ 'browser/android/intercept_download_resource_throttle.cc',
+ 'browser/android/intercept_download_resource_throttle.h',
+ 'browser/android/java_exception_reporter.cc',
+ 'browser/android/java_exception_reporter.h',
+ 'browser/android/large_icon_bridge.cc',
+ 'browser/android/large_icon_bridge.h',
+ 'browser/android/location_settings.h',
+ 'browser/android/location_settings_impl.cc',
+ 'browser/android/location_settings_impl.h',
+ 'browser/android/logo_bridge.cc',
+ 'browser/android/logo_bridge.h',
+ 'browser/android/logo_service.cc',
+ 'browser/android/logo_service.h',
+ 'browser/android/media/media_throttle_infobar_delegate.cc',
+ 'browser/android/media/media_throttle_infobar_delegate.h',
+ 'browser/android/metrics/launch_metrics.cc',
+ 'browser/android/metrics/launch_metrics.h',
+ 'browser/android/metrics/uma_session_stats.cc',
+ 'browser/android/metrics/uma_session_stats.h',
+ 'browser/android/metrics/uma_utils.cc',
+ 'browser/android/metrics/uma_utils.h',
+ 'browser/android/metrics/variations_session.cc',
+ 'browser/android/metrics/variations_session.h',
+ 'browser/android/most_visited_sites.cc',
+ 'browser/android/most_visited_sites.h',
+ 'browser/android/net/external_estimate_provider_android.cc',
+ 'browser/android/net/external_estimate_provider_android.h',
+ 'browser/android/new_tab_page_prefs.cc',
+ 'browser/android/new_tab_page_prefs.h',
+ 'browser/android/new_tab_page_url_handler.cc',
+ 'browser/android/new_tab_page_url_handler.h',
+ 'browser/android/omnibox/answers_image_bridge.cc',
+ 'browser/android/omnibox/answers_image_bridge.h',
+ 'browser/android/omnibox/autocomplete_controller_android.cc',
+ 'browser/android/omnibox/autocomplete_controller_android.h',
+ 'browser/android/omnibox/omnibox_prerender.cc',
+ 'browser/android/omnibox/omnibox_prerender.h',
+ 'browser/android/password_ui_view_android.cc',
+ 'browser/android/password_ui_view_android.h',
+ 'browser/android/popular_sites.cc',
+ 'browser/android/popular_sites.h',
+ 'browser/android/precache/precache_launcher.cc',
+ 'browser/android/precache/precache_launcher.h',
+ 'browser/android/preferences/autofill/autofill_profile_bridge.cc',
+ 'browser/android/preferences/autofill/autofill_profile_bridge.h',
+ 'browser/android/preferences/pref_service_bridge.cc',
+ 'browser/android/preferences/pref_service_bridge.h',
+ 'browser/android/preferences/website_preference_bridge.cc',
+ 'browser/android/preferences/website_preference_bridge.h',
+ 'browser/android/profiles/profile_downloader_android.cc',
+ 'browser/android/profiles/profile_downloader_android.h',
+ 'browser/android/provider/blocking_ui_thread_async_request.cc',
+ 'browser/android/provider/blocking_ui_thread_async_request.h',
+ 'browser/android/provider/bookmark_model_observer_task.cc',
+ 'browser/android/provider/bookmark_model_observer_task.h',
+ 'browser/android/provider/chrome_browser_provider.cc',
+ 'browser/android/provider/chrome_browser_provider.h',
+ 'browser/android/provider/run_on_ui_thread_blocking.h',
+ 'browser/android/rappor/rappor_service_bridge.cc',
+ 'browser/android/rappor/rappor_service_bridge.h',
+ 'browser/android/recently_closed_tabs_bridge.cc',
+ 'browser/android/recently_closed_tabs_bridge.h',
+ 'browser/android/resource_id.h',
+ 'browser/android/resource_mapper.cc',
+ 'browser/android/resource_mapper.h',
+ 'browser/android/rlz/revenue_stats.cc',
+ 'browser/android/rlz/revenue_stats.h',
+ 'browser/android/seccomp_support_detector.cc',
+ 'browser/android/seccomp_support_detector.h',
+ 'browser/android/sessions/session_tab_helper_android.cc',
+ 'browser/android/sessions/session_tab_helper_android.h',
+ 'browser/android/shortcut_helper.cc',
+ 'browser/android/shortcut_helper.h',
+ 'browser/android/shortcut_info.cc',
+ 'browser/android/shortcut_info.h',
+ 'browser/android/signin/account_management_screen_helper.cc',
+ 'browser/android/signin/account_management_screen_helper.h',
+ 'browser/android/signin/account_tracker_service_android.cc',
+ 'browser/android/signin/account_tracker_service_android.h',
+ 'browser/android/signin/signin_manager_android.cc',
+ 'browser/android/signin/signin_manager_android.h',
+ 'browser/android/tab_android.cc',
+ 'browser/android/tab_android.h',
+ 'browser/android/tab_state.cc',
+ 'browser/android/tab_state.h',
+ 'browser/android/tab_web_contents_delegate_android.cc',
+ 'browser/android/tab_web_contents_delegate_android.h',
+ 'browser/android/thumbnail/thumbnail.cc',
+ 'browser/android/thumbnail/thumbnail.h',
+ 'browser/android/thumbnail/thumbnail_cache.cc',
+ 'browser/android/thumbnail/thumbnail_cache.h',
+ 'browser/android/url_utilities.cc',
+ 'browser/android/url_utilities.h',
+ 'browser/android/voice_search_tab_helper.cc',
+ 'browser/android/voice_search_tab_helper.h',
+ 'browser/android/warmup_manager.cc',
+ 'browser/android/warmup_manager.h',
+ 'browser/android/web_contents_factory.cc',
+ 'browser/android/web_contents_factory.h',
+ 'browser/android/webapps/add_to_homescreen_data_fetcher.cc',
+ 'browser/android/webapps/add_to_homescreen_data_fetcher.h',
+ 'browser/android/webapps/add_to_homescreen_dialog_helper.cc',
+ 'browser/android/webapps/add_to_homescreen_dialog_helper.h',
+ 'browser/android/webapps/single_tab_mode_tab_helper.cc',
+ 'browser/android/webapps/single_tab_mode_tab_helper.h',
+ 'browser/android/webapps/webapp_registry.cc',
+ 'browser/android/webapps/webapp_registry.h',
+ 'browser/autofill/android/personal_data_manager_android.cc',
+ 'browser/autofill/android/personal_data_manager_android.h',
+ 'browser/dom_distiller/dom_distiller_service_factory_android.cc',
+ 'browser/dom_distiller/dom_distiller_service_factory_android.h',
+ 'browser/dom_distiller/tab_utils_android.cc',
+ 'browser/dom_distiller/tab_utils_android.h',
'browser/download/download_request_infobar_delegate_android.cc',
'browser/download/download_request_infobar_delegate_android.h',
'browser/geolocation/geolocation_infobar_delegate_android.cc',
'browser/geolocation/geolocation_infobar_delegate_android.h',
+ 'browser/interests/android/interests_service.cc',
+ 'browser/interests/android/interests_service.h',
+ 'browser/invalidation/invalidation_service_factory_android.cc',
+ 'browser/invalidation/invalidation_service_factory_android.h',
+ 'browser/lifetime/application_lifetime_android.cc',
+ 'browser/lifetime/application_lifetime_android.h',
+ 'browser/media/android/cdm/media_drm_credential_manager.cc',
+ 'browser/media/android/cdm/media_drm_credential_manager.h',
+ 'browser/media/android/remote/record_cast_action.cc',
+ 'browser/media/android/remote/record_cast_action.h',
+ 'browser/media/android/remote/remote_media_player_bridge.cc',
+ 'browser/media/android/remote/remote_media_player_bridge.h',
+ 'browser/media/android/remote/remote_media_player_manager.cc',
+ 'browser/media/android/remote/remote_media_player_manager.h',
+ 'browser/media/android/router/media_router_android.cc',
+ 'browser/media/android/router/media_router_android.h',
+ 'browser/media/android/router/media_router_dialog_controller_android.cc',
+ 'browser/media/android/router/media_router_dialog_controller_android.h',
'browser/media/media_stream_infobar_delegate_android.cc',
'browser/media/media_stream_infobar_delegate_android.h',
'browser/media/midi_permission_infobar_delegate_android.cc',
'browser/media/midi_permission_infobar_delegate_android.h',
'browser/media/protected_media_identifier_infobar_delegate_android.cc',
'browser/media/protected_media_identifier_infobar_delegate_android.h',
- 'browser/media/protected_media_identifier_permission_context.cc',
- 'browser/media/protected_media_identifier_permission_context.h',
- 'browser/media/protected_media_identifier_permission_context_factory.cc',
- 'browser/media/protected_media_identifier_permission_context_factory.h',
'browser/metrics/android_metrics_provider.cc',
'browser/metrics/android_metrics_provider.h',
'browser/net/spdyproxy/data_reduction_proxy_infobar_delegate_android.cc',
'browser/net/spdyproxy/data_reduction_proxy_infobar_delegate_android.h',
+ 'browser/net/spdyproxy/data_reduction_proxy_settings_android.cc',
+ 'browser/net/spdyproxy/data_reduction_proxy_settings_android.h',
'browser/password_manager/account_chooser_dialog_android.cc',
'browser/password_manager/account_chooser_dialog_android.h',
'browser/password_manager/auto_signin_first_run_infobar_delegate.cc',
@@ -924,6 +926,12 @@
'browser/permissions/permission_queue_controller.h',
'browser/precache/precache_manager_factory.cc',
'browser/precache/precache_manager_factory.h',
+ 'browser/prerender/external_prerender_handler_android.cc',
+ 'browser/prerender/external_prerender_handler_android.h',
+ 'browser/profiles/profile_android.cc',
+ 'browser/profiles/profile_android.h',
+ 'browser/search/contextual_search_policy_handler_android.cc',
+ 'browser/search/contextual_search_policy_handler_android.h',
'browser/signin/oauth2_token_service_delegate_android.cc',
'browser/signin/oauth2_token_service_delegate_android.h',
'browser/ssl/ssl_add_certificate_android.cc',
@@ -1730,14 +1738,6 @@
'browser/google/google_url_tracker_factory.h',
],
'chrome_browser_history_sources': [
- 'browser/history/android/android_history_provider_service.cc',
- 'browser/history/android/android_history_provider_service.h',
- 'browser/history/android/android_provider_backend.cc',
- 'browser/history/android/android_provider_backend.h',
- 'browser/history/android/bookmark_model_sql_handler.cc',
- 'browser/history/android/bookmark_model_sql_handler.h',
- 'browser/history/android/sqlite_cursor.cc',
- 'browser/history/android/sqlite_cursor.h',
'browser/history/chrome_history_backend_client.cc',
'browser/history/chrome_history_backend_client.h',
'browser/history/chrome_history_client.cc',
@@ -1753,6 +1753,17 @@
'browser/history/web_history_service_factory.cc',
'browser/history/web_history_service_factory.h',
],
+ # History sources used when android_java_ui is enabled.
+ 'chrome_browser_history_android_java_ui_sources': [
+ 'browser/history/android/android_history_provider_service.cc',
+ 'browser/history/android/android_history_provider_service.h',
+ 'browser/history/android/android_provider_backend.cc',
+ 'browser/history/android/android_provider_backend.h',
+ 'browser/history/android/bookmark_model_sql_handler.cc',
+ 'browser/history/android/bookmark_model_sql_handler.h',
+ 'browser/history/android/sqlite_cursor.cc',
+ 'browser/history/android/sqlite_cursor.h',
+ ],
'chrome_browser_jni_sources': [
'android/java/src/org/chromium/chrome/browser/AfterStartupTaskUtils.java',
'android/java/src/org/chromium/chrome/browser/ApplicationLifetime.java',
@@ -2006,8 +2017,6 @@
'browser/net/spdyproxy/data_reduction_proxy_chrome_settings.h',
'browser/net/spdyproxy/data_reduction_proxy_chrome_settings_factory.cc',
'browser/net/spdyproxy/data_reduction_proxy_chrome_settings_factory.h',
- 'browser/net/spdyproxy/data_reduction_proxy_settings_android.cc',
- 'browser/net/spdyproxy/data_reduction_proxy_settings_android.h',
'browser/net/timed_cache.cc',
'browser/net/timed_cache.h',
'browser/net/url_info.cc',
@@ -2029,8 +2038,6 @@
'browser/notifications/notification_permission_context_factory.cc',
'browser/notifications/notification_permission_context_factory.h',
'browser/notifications/notification_ui_manager.h',
- 'browser/notifications/notification_ui_manager_android.cc',
- 'browser/notifications/notification_ui_manager_android.h',
'browser/notifications/notifier_state_tracker.cc',
'browser/notifications/notifier_state_tracker.h',
'browser/notifications/notifier_state_tracker_factory.cc',
@@ -2044,8 +2051,10 @@
'browser/push_messaging/push_messaging_notification_manager.cc',
'browser/push_messaging/push_messaging_notification_manager.h',
],
- # Used on Android when notifications are enabled.
- 'chrome_browser_notifications_android_sources': [
+ # Used on Android when notifications and java_ui are enabled.
+ 'chrome_browser_notifications_android_java_ui_sources': [
+ 'browser/notifications/notification_ui_manager_android.cc',
+ 'browser/notifications/notification_ui_manager_android.h',
'browser/notifications/notification_permission_infobar_delegate.cc',
'browser/notifications/notification_permission_infobar_delegate.h',
],
@@ -2126,11 +2135,14 @@
'browser/permissions/permission_request_id.h',
'browser/permissions/permission_uma_util.cc',
'browser/permissions/permission_uma_util.h',
- 'browser/permissions/permission_update_infobar_delegate_android.cc',
- 'browser/permissions/permission_update_infobar_delegate_android.h',
'browser/permissions/permission_util.cc',
'browser/permissions/permission_util.h',
],
+ # Permissions sources used when android_java_ui is enabled.
+ 'chrome_browser_permissions_android_java_ui_sources': [
+ 'browser/permissions/permission_update_infobar_delegate_android.cc',
+ 'browser/permissions/permission_update_infobar_delegate_android.h',
+ ],
# See also the plugin_installation_sources list below.
'chrome_browser_plugins_sources': [
'browser/browsing_data/browsing_data_flash_lso_helper.cc',
@@ -2407,8 +2419,6 @@
'browser/profiles/off_the_record_profile_io_data.h',
'browser/profiles/profile.cc',
'browser/profiles/profile.h',
- 'browser/profiles/profile_android.cc',
- 'browser/profiles/profile_android.h',
'browser/profiles/profile_attributes_entry.cc',
'browser/profiles/profile_attributes_entry.h',
'browser/profiles/profile_attributes_storage.h',
@@ -2606,8 +2616,6 @@
'browser/search_engines/search_provider_install_state_message_filter.h',
'browser/search_engines/template_url_fetcher_factory.cc',
'browser/search_engines/template_url_fetcher_factory.h',
- 'browser/search_engines/template_url_service_android.cc',
- 'browser/search_engines/template_url_service_android.h',
'browser/search_engines/template_url_service_factory.cc',
'browser/search_engines/template_url_service_factory.h',
'browser/search_engines/ui_thread_search_terms_data.cc',
@@ -2615,6 +2623,11 @@
'browser/search_engines/ui_thread_search_terms_data_android.cc',
'browser/search_engines/ui_thread_search_terms_data_android.h',
],
+ # Search sources used when android_java_ui is enabled.
+ 'chrome_browser_search_engines_android_java_ui_sources': [
+ 'browser/search_engines/template_url_service_android.cc',
+ 'browser/search_engines/template_url_service_android.h',
+ ],
'chrome_browser_service_discovery_sources': [
'browser/local_discovery/cloud_device_list.cc',
'browser/local_discovery/cloud_device_list.h',
@@ -2792,8 +2805,6 @@
'browser/ssl/common_name_mismatch_handler.h',
'browser/ssl/security_state_model.cc',
'browser/ssl/security_state_model.h',
- 'browser/ssl/security_state_model_android.cc',
- 'browser/ssl/security_state_model_android.h',
'browser/ssl/security_state_model_client.h',
'browser/ssl/ssl_blocking_page.cc',
'browser/ssl/ssl_blocking_page.h',
@@ -2802,15 +2813,16 @@
'browser/ssl/ssl_error_handler.cc',
'browser/ssl/ssl_error_handler.h',
],
+ # SSL sources used when android_java_ui is enabled.
+ 'chrome_browser_ssl_android_java_ui_sources': [
+ 'browser/ssl/security_state_model_android.cc',
+ 'browser/ssl/security_state_model_android.h',
+ ],
'chrome_browser_supervised_user_sources': [
'browser/content_settings/content_settings_supervised_provider.cc',
'browser/content_settings/content_settings_supervised_provider.h',
- 'browser/supervised_user/child_accounts/child_account_feedback_reporter_android.cc',
- 'browser/supervised_user/child_accounts/child_account_feedback_reporter_android.h',
'browser/supervised_user/child_accounts/child_account_service.cc',
'browser/supervised_user/child_accounts/child_account_service.h',
- 'browser/supervised_user/child_accounts/child_account_service_android.cc',
- 'browser/supervised_user/child_accounts/child_account_service_android.h',
'browser/supervised_user/child_accounts/child_account_service_factory.cc',
'browser/supervised_user/child_accounts/child_account_service_factory.h',
'browser/supervised_user/child_accounts/family_info_fetcher.cc',
@@ -2855,6 +2867,13 @@
'browser/supervised_user/supervised_user_whitelist_service.h',
'browser/supervised_user/supervised_users.h',
],
+ # Child accounts sources used with android_java_ui enabled.
+ 'chrome_browser_supervised_user_android_java_ui_sources': [
+ 'browser/supervised_user/child_accounts/child_account_feedback_reporter_android.cc',
+ 'browser/supervised_user/child_accounts/child_account_feedback_reporter_android.h',
+ 'browser/supervised_user/child_accounts/child_account_service_android.cc',
+ 'browser/supervised_user/child_accounts/child_account_service_android.h',
+ ],
# TODO(bauerb): This code should be removed (on desktop) once child account
# support has launched (https://crbug.com/505443).
'chrome_browser_supervised_user_legacy_sources': [
@@ -2897,14 +2916,6 @@
'browser/sync/glue/extensions_activity_monitor.h',
'browser/sync/glue/sync_start_util.cc',
'browser/sync/glue/sync_start_util.h',
- 'browser/sync/glue/synced_tab_delegate_android.cc',
- 'browser/sync/glue/synced_tab_delegate_android.h',
- 'browser/sync/glue/synced_window_delegate_android.cc',
- 'browser/sync/glue/synced_window_delegate_android.h',
- 'browser/sync/glue/synced_window_delegates_getter_android.cc',
- 'browser/sync/glue/synced_window_delegates_getter_android.h',
- 'browser/sync/profile_sync_service_android.cc',
- 'browser/sync/profile_sync_service_android.h',
'browser/sync/profile_sync_service_factory.cc',
'browser/sync/profile_sync_service_factory.h',
'browser/sync/sessions/notification_service_sessions_router.cc',
@@ -2914,6 +2925,17 @@
'browser/sync/sync_startup_tracker.cc',
'browser/sync/sync_startup_tracker.h',
],
+ # Sync sources used when android_java_ui is enabled.
+ 'chrome_browser_sync_android_java_ui_sources': [
+ 'browser/sync/glue/synced_tab_delegate_android.cc',
+ 'browser/sync/glue/synced_tab_delegate_android.h',
+ 'browser/sync/glue/synced_window_delegate_android.cc',
+ 'browser/sync/glue/synced_window_delegate_android.h',
+ 'browser/sync/profile_sync_service_android.cc',
+ 'browser/sync/profile_sync_service_android.h',
+ 'browser/sync/glue/synced_window_delegates_getter_android.cc',
+ 'browser/sync/glue/synced_window_delegates_getter_android.h',
+ ],
'chrome_browser_task_manager_sources': [
# Stats collection for CAPS (uses old task manager):
'browser/caps/generate_state_json.cc',
@@ -3606,13 +3628,13 @@
['notifications==1', {
'sources': [ '<@(chrome_browser_notifications_sources)' ],
'conditions': [
- ['OS!="android"', {
+ ['android_java_ui==0', {
'sources': [
'<@(chrome_browser_notifications_non_android_sources)',
],
}, {
'sources': [
- '<@(chrome_browser_notifications_android_sources)',
+ '<@(chrome_browser_notifications_android_java_ui_sources)',
],
}],
],
@@ -3665,21 +3687,9 @@
'dependencies': [
'../build/android/ndk.gyp:cpu_features',
'../components/components.gyp:cdm_browser',
- '../components/components.gyp:data_reduction_proxy_content',
- '../components/components.gyp:data_usage_android',
- '../components/components.gyp:enhanced_bookmarks',
- '../components/components.gyp:offline_pages',
- '../components/components.gyp:precache_content',
- '../components/components.gyp:precache_core',
- '../components/components.gyp:service_tab_launcher',
- '../components/components.gyp:toolbar',
- '../components/components.gyp:web_contents_delegate_android',
'../components/components_resources.gyp:components_resources',
'../third_party/android_opengl/etc1/etc1.gyp:etc1',
'../third_party/libaddressinput/libaddressinput.gyp:libaddressinput_util',
- 'chrome_browser_jni_headers',
- 'client_discourse_context_proto',
- 'delta_file_proto',
],
'dependencies!': [
'../components/components.gyp:storage_monitor',
@@ -3688,10 +3698,35 @@
],
'sources': [
'<@(chrome_browser_android_sources)',
- '<@(chrome_browser_bookmark_android_sources)',
],
- 'defines': [ 'ENABLE_DATA_REDUCTION_PROXY_DEBUGGING' ],
'conditions': [
+ ['android_java_ui==1', {
+ 'dependencies': [
+ '../components/components.gyp:data_reduction_proxy_content',
+ '../components/components.gyp:data_usage_android',
+ '../components/components.gyp:enhanced_bookmarks',
+ '../components/components.gyp:offline_pages',
+ '../components/components.gyp:precache_content',
+ '../components/components.gyp:precache_core',
+ '../components/components.gyp:service_tab_launcher',
+ '../components/components.gyp:toolbar',
+ '../components/components.gyp:web_contents_delegate_android',
+ 'chrome_browser_jni_headers',
+ 'client_discourse_context_proto',
+ 'delta_file_proto',
+ ],
+ 'sources': [
+ '<@(chrome_browser_android_java_ui_sources)',
+ '<@(chrome_browser_bookmark_android_sources)',
+ '<@(chrome_browser_sync_android_java_ui_sources)',
+ '<@(chrome_browser_supervised_user_android_java_ui_sources)',
+ '<@(chrome_browser_ssl_android_java_ui_sources)',
+ '<@(chrome_browser_search_engines_android_java_ui_sources)',
+ '<@(chrome_browser_permissions_android_java_ui_sources)',
+ '<@(chrome_browser_history_android_java_ui_sources)',
+ ],
+ 'defines': [ 'ENABLE_DATA_REDUCTION_PROXY_DEBUGGING' ],
+ }],
['use_seccomp_bpf==1', {
'defines': ['USE_SECCOMP_BPF'],
'dependencies': [
@@ -3939,7 +3974,7 @@
},
],
'conditions': [
- ['OS=="android"', {
+ ['android_java_ui == 1', {
'targets': [
{
# GN: //chrome/browser:jni_headers
« no previous file with comments | « chrome/browser/ui/webui/net_export_ui.cc ('k') | chrome/chrome_browser_ui.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698