Index: content/browser/BUILD.gn |
diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn |
index 3aaba24791e39dfff444bc3dc7e35fe5b9d4ddfa..35d907a51a4c28886fb9c20e67cd4c1f15667685 100644 |
--- a/content/browser/BUILD.gn |
+++ b/content/browser/BUILD.gn |
@@ -344,7 +344,7 @@ source_set("browser") { |
"geolocation/network_location_provider.h", |
"geolocation/network_location_request.cc", |
"geolocation/network_location_request.h", |
- "renderer_host/begin_frame_observer_proxy.cc", |
+# "renderer_host/begin_frame_observer_proxy.cc", |
"tracing/tracing_ui.cc", |
"tracing/tracing_ui.h", |
@@ -370,6 +370,13 @@ source_set("browser") { |
"speech/speech_recognizer_impl.cc", |
"speech/speech_recognizer_impl.h", |
] |
+ |
+ if (!use_aura) { |
+ sources -= [ |
+ "renderer_host/begin_frame_observer_proxy.cc", |
no sievers
2015/10/20 19:24:22
let's consider moving this to 'compositor_browser_
|
+ ] |
+ } |
+ |
deps += [ |
"//content/public/android:jni", |
"//media", |
@@ -412,6 +419,116 @@ source_set("browser") { |
"//ui/strings", |
"//ui/wm", |
] |
+ |
+ if (is_android) { |
+ sources-= [ |
+ "accessibility/accessibility_tree_formatter_android.cc", |
+ "accessibility/browser_accessibility_android.cc", |
+ "accessibility/browser_accessibility_android.h", |
+ "accessibility/browser_accessibility_manager_android.cc", |
+ "accessibility/browser_accessibility_manager_android.h", |
no sievers
2015/10/20 19:24:21
let's pull out all accessibility-related changes i
|
+ |
+ "android/animation_utils.h", |
no sievers
2015/10/20 19:24:21
android/animation_utils.h and touch handle and edg
|
+ "android/background_sync_launcher_android.cc", |
+ "android/background_sync_launcher_android.h", |
no sievers
2015/10/20 19:24:22
to-be-decoupled
|
+ # "android/browser_jni_registrar.cc", |
+ # "android/browser_jni_registrar.h", |
+ # "android/browser_startup_controller.cc", |
+ # "android/browser_startup_controller.h", |
+ "android/browser_surface_texture_manager.cc", |
+ "android/browser_surface_texture_manager.h", |
no sievers
2015/10/20 19:24:22
try to keep this in
|
+ |
+ # "android/child_process_launcher_android.cc", |
+ # "android/child_process_launcher_android.h", |
+ |
+ "android/composited_touch_handle_drawable.cc", |
+ "android/composited_touch_handle_drawable.h", |
+ "android/content_protocol_handler_impl.cc", |
+ "android/content_protocol_handler_impl.h", |
no sievers
2015/10/20 19:24:22
need to keep content_protocol_handler for file req
|
+ "android/content_readback_handler.cc", |
+ "android/content_readback_handler.h", |
+ # "android/content_startup_flags.cc", |
no sievers
2015/10/20 19:24:22
should keep content_startup_flags.cc
|
+ # "android/content_startup_flags.h", |
+ "android/content_video_view.cc", |
+ "android/content_video_view.h", |
+ "android/content_view_core_impl.cc", |
+ "android/content_view_core_impl.h", |
+ "android/content_view_render_view.cc", |
+ "android/content_view_render_view.h", |
+ "android/content_view_statics.cc", |
+ "android/content_view_statics.h", |
+ "android/date_time_chooser_android.cc", |
+ "android/date_time_chooser_android.h", |
+ "android/deferred_download_observer.cc", |
+ "android/deferred_download_observer.h", |
+ # "android/devtools_auth.cc", |
+ "android/download_controller_android_impl.cc", |
+ "android/download_controller_android_impl.h", |
+ "android/edge_effect.cc", |
+ "android/edge_effect.h", |
+ "android/edge_effect_l.cc", |
+ "android/edge_effect_l.h", |
+ "android/in_process/context_provider_in_process.cc", |
+ "android/in_process/context_provider_in_process.h", |
+ "android/in_process/synchronous_compositor_external_begin_frame_source.cc", |
+ "android/in_process/synchronous_compositor_external_begin_frame_source.h", |
+ "android/in_process/synchronous_compositor_factory_impl.cc", |
+ "android/in_process/synchronous_compositor_factory_impl.h", |
+ "android/in_process/synchronous_compositor_impl.cc", |
+ "android/in_process/synchronous_compositor_impl.h", |
+ "android/in_process/synchronous_compositor_output_surface.cc", |
+ "android/in_process/synchronous_compositor_output_surface.h", |
+ "android/in_process/synchronous_compositor_registry.cc", |
+ "android/in_process/synchronous_compositor_registry.h", |
+ "android/in_process/synchronous_input_event_filter.cc", |
+ "android/in_process/synchronous_input_event_filter.h", |
+ "android/in_process_surface_texture_manager.cc", |
+ "android/in_process_surface_texture_manager.h", |
no sievers
2015/10/20 19:24:21
keep in_process_surface_texture_manager
|
+ "android/interstitial_page_delegate_android.cc", |
+ "android/interstitial_page_delegate_android.h", |
+ "android/load_url_params.cc", |
+ "android/load_url_params.h", |
+ "android/media_players_observer.cc", |
+ "android/media_players_observer.h", |
no sievers
2015/10/20 19:24:22
this is gone, but keep all media_player stuff
|
+ "android/overscroll_controller_android.cc", |
+ "android/overscroll_controller_android.h", |
+ "android/overscroll_glow.cc", |
+ "android/overscroll_glow.h", |
+ "android/overscroll_refresh.cc", |
+ "android/overscroll_refresh.h", |
+ "android/popup_touch_handle_drawable.cc", |
+ "android/popup_touch_handle_drawable.h", |
+ "android/tracing_controller_android.cc", |
+ "android/tracing_controller_android.h", |
no sievers
2015/10/20 19:24:22
keep tracing_controller
|
+ "android/url_request_content_job.cc", |
+ "android/url_request_content_job.h", |
no sievers
2015/10/20 19:24:22
keep url_request_content_job
|
+ "android/web_contents_observer_proxy.cc", |
+ "android/web_contents_observer_proxy.h", |
+ |
+ "media/android/browser_media_player_manager.h", |
+ "media/android/browser_media_player_manager.cc", |
+ "media/android/media_session.h", |
+ "media/android/media_session.cc", |
no sievers
2015/10/20 19:24:22
keep these
|
+ |
+ "renderer_host/compositor_impl_android.cc", |
+ "renderer_host/ime_adapter_android.cc", |
+ "renderer_host/ime_adapter_android.h", |
+ "renderer_host/input/synthetic_gesture_target_android.h", |
+ "renderer_host/input/synthetic_gesture_target_android.cc", |
+ "renderer_host/native_web_keyboard_event_android.cc", |
+ "renderer_host/render_widget_host_view_android.cc", |
+ "renderer_host/render_widget_host_view_android.h", |
+ "screen_orientation/screen_orientation_delegate_android.cc", |
+ "screen_orientation/screen_orientation_delegate_android.h", |
+ "screen_orientation/screen_orientation_message_filter_android.cc", |
+ "screen_orientation/screen_orientation_message_filter_android.h", |
no sievers
2015/10/20 19:24:22
this we should also try to keep (for screen orient
|
+ "web_contents/web_contents_android.cc", |
+ "web_contents/web_contents_android.h", |
+ "web_contents/web_contents_view_android.cc", |
+ "web_contents/web_contents_view_android.h", |
+ "power_save_blocker_android.cc", |
no sievers
2015/10/20 19:24:21
let's file a bug for implementing power save block
|
+ ] |
+ } |
} else { # Not aura. |
sources -= [ |
"renderer_host/compositor_resize_lock_aura.cc", |