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

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: Merging android_non_aura_browser_sources into android_browser_sources rather than private_browser_s… 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..aa99af385c0d2335f6278f719230223ea6f85e01 100644
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -1581,6 +1581,27 @@
'zygote/zygote_main_linux.cc',
],
'android_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/java/gin_java_bound_object.cc',
'browser/android/java/gin_java_bound_object.h',
'browser/android/java/gin_java_bound_object_delegate.cc',
@@ -1601,6 +1622,36 @@
'browser/android/java/java_type.h',
'browser/android/java/jni_helper.cc',
'browser/android/java/jni_helper.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',
],
'android_in_process_browser_sources': [
'browser/android/in_process/context_provider_in_process.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',
- '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