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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/content_browser.gypi

Issue 1649483002: Revert of Aura on Android: content/browser (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@auraclank_upstream_select_file
Patch Set: Removed a TODO Created 4 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
« no previous file with comments | « content/child/BUILD.gn ('k') | content/public/browser/native_web_keyboard_event.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/content_browser.gypi
diff --git a/content/content_browser.gypi b/content/content_browser.gypi
index 5acb0dee466be250e1bf848ba661fd8977092076..f10799f7200ded45b19677fb2dca8d068bf94388 100644
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -319,6 +319,7 @@
'browser/accessibility/accessibility_mode_helper.h',
'browser/accessibility/accessibility_tree_formatter.cc',
'browser/accessibility/accessibility_tree_formatter.h',
+ 'browser/accessibility/accessibility_tree_formatter_android.cc',
'browser/accessibility/accessibility_tree_formatter_blink.cc',
'browser/accessibility/accessibility_tree_formatter_blink.h',
'browser/accessibility/accessibility_tree_formatter_mac.mm',
@@ -332,12 +333,16 @@
'browser/accessibility/ax_tree_id_registry.h',
'browser/accessibility/browser_accessibility.cc',
'browser/accessibility/browser_accessibility.h',
+ 'browser/accessibility/browser_accessibility_android.cc',
+ 'browser/accessibility/browser_accessibility_android.h',
'browser/accessibility/browser_accessibility_cocoa.h',
'browser/accessibility/browser_accessibility_cocoa.mm',
'browser/accessibility/browser_accessibility_mac.h',
'browser/accessibility/browser_accessibility_mac.mm',
'browser/accessibility/browser_accessibility_manager.cc',
'browser/accessibility/browser_accessibility_manager.h',
+ 'browser/accessibility/browser_accessibility_manager_android.cc',
+ 'browser/accessibility/browser_accessibility_manager_android.h',
'browser/accessibility/browser_accessibility_manager_mac.h',
'browser/accessibility/browser_accessibility_manager_mac.mm',
'browser/accessibility/browser_accessibility_manager_win.cc',
@@ -359,18 +364,44 @@
'browser/android/browser_surface_texture_manager.h',
'browser/android/child_process_launcher_android.cc',
'browser/android/child_process_launcher_android.h',
+ 'browser/android/composited_touch_handle_drawable.cc',
+ 'browser/android/composited_touch_handle_drawable.h',
'browser/android/content_protocol_handler_impl.cc',
'browser/android/content_protocol_handler_impl.h',
'browser/android/content_startup_flags.cc',
'browser/android/content_startup_flags.h',
'browser/android/content_video_view.cc',
'browser/android/content_video_view.h',
+ 'browser/android/content_view_core_impl.cc',
+ 'browser/android/content_view_core_impl.h',
+ 'browser/android/content_view_render_view.cc',
+ 'browser/android/content_view_render_view.h',
+ 'browser/android/content_view_statics.cc',
+ 'browser/android/content_view_statics.h',
+ 'browser/android/date_time_chooser_android.cc',
+ 'browser/android/date_time_chooser_android.h',
+ 'browser/android/deferred_download_observer.cc',
+ 'browser/android/deferred_download_observer.h',
'browser/android/devtools_auth.cc',
+ 'browser/android/download_controller_android_impl.cc',
+ 'browser/android/download_controller_android_impl.h',
'browser/android/in_process_surface_texture_manager.cc',
'browser/android/in_process_surface_texture_manager.h',
+ 'browser/android/interstitial_page_delegate_android.cc',
+ 'browser/android/interstitial_page_delegate_android.h',
+ 'browser/android/load_url_params.cc',
+ 'browser/android/load_url_params.h',
'public/browser/android/download_controller_android.h',
+ 'browser/android/overscroll_controller_android.cc',
+ 'browser/android/overscroll_controller_android.h',
+ 'browser/android/popup_touch_handle_drawable.cc',
+ 'browser/android/popup_touch_handle_drawable.h',
+ 'browser/android/tracing_controller_android.cc',
+ 'browser/android/tracing_controller_android.h',
'browser/android/url_request_content_job.cc',
'browser/android/url_request_content_job.h',
+ 'browser/android/web_contents_observer_proxy.cc',
+ 'browser/android/web_contents_observer_proxy.h',
'browser/appcache/appcache.cc',
'browser/appcache/appcache.h',
'browser/appcache/appcache_backend_impl.cc',
@@ -502,6 +533,8 @@
'browser/cocoa/system_hotkey_helper_mac.mm',
'browser/cocoa/system_hotkey_map.h',
'browser/cocoa/system_hotkey_map.mm',
+ 'browser/compositor/browser_compositor_overlay_candidate_validator_android.cc',
mfomitchev 2016/01/27 23:00:51 @sivers: does this look okay to you? Seems a bit w
no sievers 2016/01/27 23:08:06 You could also just leave the list with the androi
mfomitchev 2016/01/28 00:20:31 Done.
+ 'browser/compositor/browser_compositor_overlay_candidate_validator_android.h',
'browser/device_monitor_mac.h',
'browser/device_monitor_mac.mm',
'browser/device_monitor_udev.cc',
@@ -1094,6 +1127,7 @@
'browser/permissions/permission_service_impl.h',
'browser/power_monitor_message_broadcaster.cc',
'browser/power_monitor_message_broadcaster.h',
+ 'browser/power_save_blocker_android.cc',
'browser/power_save_blocker_android.h',
'browser/power_save_blocker_chromeos.cc',
'browser/power_save_blocker_impl.cc',
@@ -1124,6 +1158,8 @@
'browser/renderer_host/clipboard_message_filter.cc',
'browser/renderer_host/clipboard_message_filter.h',
'browser/renderer_host/clipboard_message_filter_mac.mm',
+ 'browser/renderer_host/compositor_impl_android.cc',
+ 'browser/renderer_host/compositor_impl_android.h',
'browser/renderer_host/compositor_resize_lock_aura.cc',
'browser/renderer_host/compositor_resize_lock_aura.h',
'browser/renderer_host/database_message_filter.cc',
@@ -1145,6 +1181,8 @@
'browser/renderer_host/gamepad_browser_message_filter.h',
'browser/renderer_host/gpu_message_filter.cc',
'browser/renderer_host/gpu_message_filter.h',
+ 'browser/renderer_host/ime_adapter_android.cc',
+ 'browser/renderer_host/ime_adapter_android.h',
'browser/renderer_host/input/gesture_event_queue.cc',
'browser/renderer_host/input/gesture_event_queue.h',
'browser/renderer_host/input/input_ack_handler.h',
@@ -1169,6 +1207,8 @@
'browser/renderer_host/input/synthetic_gesture_controller.cc',
'browser/renderer_host/input/synthetic_gesture_controller.h',
'browser/renderer_host/input/synthetic_gesture_target.h',
+ 'browser/renderer_host/input/synthetic_gesture_target_android.cc',
+ 'browser/renderer_host/input/synthetic_gesture_target_android.h',
'browser/renderer_host/input/synthetic_gesture_target_aura.cc',
'browser/renderer_host/input/synthetic_gesture_target_aura.h',
'browser/renderer_host/input/synthetic_gesture_target_base.cc',
@@ -1266,6 +1306,7 @@
'browser/renderer_host/media/video_capture_host.h',
'browser/renderer_host/media/video_capture_manager.cc',
'browser/renderer_host/media/video_capture_manager.h',
+ 'browser/renderer_host/native_web_keyboard_event_android.cc',
'browser/renderer_host/native_web_keyboard_event_aura.cc',
'browser/renderer_host/native_web_keyboard_event_mac.mm',
'browser/renderer_host/overscroll_configuration.cc',
@@ -1294,6 +1335,8 @@
'browser/renderer_host/render_widget_host_input_event_router.cc',
'browser/renderer_host/render_widget_host_input_event_router.h',
'browser/renderer_host/render_widget_host_owner_delegate.h',
+ 'browser/renderer_host/render_widget_host_view_android.cc',
+ 'browser/renderer_host/render_widget_host_view_android.h',
'browser/renderer_host/render_widget_host_view_aura.cc',
'browser/renderer_host/render_widget_host_view_aura.h',
'browser/renderer_host/render_widget_host_view_base.cc',
@@ -1331,8 +1374,12 @@
'browser/resource_context_impl.h',
'browser/safe_util_win.cc',
'browser/safe_util_win.h',
+ 'browser/screen_orientation/screen_orientation_delegate_android.cc',
+ 'browser/screen_orientation/screen_orientation_delegate_android.h',
'browser/screen_orientation/screen_orientation_dispatcher_host_impl.cc',
'browser/screen_orientation/screen_orientation_dispatcher_host_impl.h',
+ 'browser/screen_orientation/screen_orientation_message_filter_android.cc',
+ 'browser/screen_orientation/screen_orientation_message_filter_android.h',
'browser/service_worker/embedded_worker_instance.cc',
'browser/service_worker/embedded_worker_instance.h',
'browser/service_worker/embedded_worker_registry.cc',
@@ -1537,9 +1584,13 @@
'browser/web_contents/aura/overscroll_window_delegate.h',
'browser/web_contents/aura/shadow_layer_delegate.cc',
'browser/web_contents/aura/shadow_layer_delegate.h',
+ 'browser/web_contents/web_contents_android.cc',
+ 'browser/web_contents/web_contents_android.h',
'browser/web_contents/web_contents_impl.cc',
'browser/web_contents/web_contents_impl.h',
'browser/web_contents/web_contents_view.h',
+ 'browser/web_contents/web_contents_view_android.cc',
+ 'browser/web_contents/web_contents_view_android.h',
'browser/web_contents/web_contents_view_aura.cc',
'browser/web_contents/web_contents_view_aura.h',
'browser/web_contents/web_contents_view_guest.cc',
@@ -1618,59 +1669,7 @@
'browser/android/synchronous_compositor_host.cc',
'browser/android/synchronous_compositor_host.h',
],
- 'android_non_aura_browser_sources': [
- 'browser/accessibility/accessibility_tree_formatter_android.cc',
- 'browser/accessibility/browser_accessibility_android.cc',
- 'browser/accessibility/browser_accessibility_android.h',
- 'browser/accessibility/browser_accessibility_manager_android.cc',
- 'browser/accessibility/browser_accessibility_manager_android.h',
- 'browser/android/composited_touch_handle_drawable.cc',
- 'browser/android/composited_touch_handle_drawable.h',
- 'browser/android/content_view_core_impl.cc',
- 'browser/android/content_view_core_impl.h',
- 'browser/android/content_view_render_view.cc',
- 'browser/android/content_view_render_view.h',
- 'browser/android/content_view_statics.cc',
- 'browser/android/content_view_statics.h',
- 'browser/android/date_time_chooser_android.cc',
- 'browser/android/date_time_chooser_android.h',
- 'browser/android/deferred_download_observer.cc',
- 'browser/android/deferred_download_observer.h',
- 'browser/android/download_controller_android_impl.cc',
- 'browser/android/download_controller_android_impl.h',
- 'browser/android/interstitial_page_delegate_android.cc',
- 'browser/android/interstitial_page_delegate_android.h',
- 'browser/android/load_url_params.cc',
- 'browser/android/load_url_params.h',
- 'browser/android/overscroll_controller_android.cc',
- 'browser/android/overscroll_controller_android.h',
- 'browser/android/popup_touch_handle_drawable.cc',
- 'browser/android/popup_touch_handle_drawable.h',
- 'browser/android/tracing_controller_android.cc',
- 'browser/android/tracing_controller_android.h',
- 'browser/android/web_contents_observer_proxy.cc',
- 'browser/android/web_contents_observer_proxy.h',
- 'browser/compositor/browser_compositor_overlay_candidate_validator_android.cc',
- 'browser/compositor/browser_compositor_overlay_candidate_validator_android.h',
- 'browser/power_save_blocker_android.cc',
- 'browser/renderer_host/compositor_impl_android.cc',
- 'browser/renderer_host/compositor_impl_android.h',
- 'browser/renderer_host/ime_adapter_android.cc',
- 'browser/renderer_host/ime_adapter_android.h',
- 'browser/renderer_host/input/synthetic_gesture_target_android.cc',
- 'browser/renderer_host/input/synthetic_gesture_target_android.h',
- 'browser/renderer_host/native_web_keyboard_event_android.cc',
- 'browser/renderer_host/render_widget_host_view_android.cc',
- 'browser/renderer_host/render_widget_host_view_android.h',
- 'browser/screen_orientation/screen_orientation_delegate_android.cc',
- 'browser/screen_orientation/screen_orientation_delegate_android.h',
- 'browser/screen_orientation/screen_orientation_message_filter_android.cc',
- 'browser/screen_orientation/screen_orientation_message_filter_android.h',
- 'browser/web_contents/web_contents_android.cc',
- 'browser/web_contents/web_contents_android.h',
- 'browser/web_contents/web_contents_view_android.cc',
- 'browser/web_contents/web_contents_view_android.h',
- ],
+
'auralinux_browser_sources': [
'browser/accessibility/accessibility_tree_formatter_auralinux.cc',
'browser/accessibility/browser_accessibility_auralinux.cc',
@@ -1707,8 +1706,6 @@
'browser/compositor/browser_compositor_output_surface.cc',
'browser/compositor/browser_compositor_output_surface.h',
'browser/compositor/browser_compositor_overlay_candidate_validator.h',
- 'browser/compositor/browser_compositor_overlay_candidate_validator_android.cc',
mfomitchev 2016/01/27 23:00:51 @sievers: Does this seem okay (since compositor_br
- 'browser/compositor/browser_compositor_overlay_candidate_validator_android.h',
'browser/compositor/browser_compositor_overlay_candidate_validator_mac.h',
'browser/compositor/browser_compositor_overlay_candidate_validator_mac.mm',
'browser/compositor/browser_compositor_overlay_candidate_validator_ozone.cc',
@@ -2072,7 +2069,10 @@
['exclude', '^browser/tracing/trace_uploader\\.(cc|h)$'],
['exclude', '^browser/tracing/tracing_ui\\.(cc|h)$'],
],
- 'sources': [ '<@(android_browser_sources)', ],
+ 'sources': [
+ '<@(android_browser_sources)',
+ '<@(android_in_process_browser_sources)',
+ ],
'sources!': [
'browser/browser_ipc_logging.cc',
'browser/geolocation/device_data_provider.cc',
@@ -2080,17 +2080,9 @@
'browser/geolocation/wifi_data_provider_common.cc',
'browser/power_usage_monitor_impl.cc',
'browser/power_usage_monitor_impl.h',
+ 'browser/renderer_host/begin_frame_observer_proxy.cc',
'browser/renderer_host/native_web_keyboard_event.cc',
- ],
- 'conditions': [
- ['use_aura == 0', {
- 'sources': [
- '<@(android_in_process_browser_sources)',
- '<@(android_non_aura_browser_sources)',
- ],
- 'sources!': [ 'browser/renderer_host/begin_frame_observer_proxy.cc', ],
- }],
- ],
+ ]
}],
['OS=="mac"', {
'sources/': [
« no previous file with comments | « content/child/BUILD.gn ('k') | content/public/browser/native_web_keyboard_event.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698