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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/browser/BUILD.gn

Issue 1411503005: Aura on Android: content/browser (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@auraclank_upstream_select_file
Patch Set: Getting rid of BrowserStartupController changes 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 | « components/tracing/trace_config_file.cc ('k') | content/browser/accessibility/accessibility_tree_formatter.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/BUILD.gn
diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
index 23dca61865debf74c1bafd5b68b868b9e2299f33..12e3a42e46c9485da43cff3564b79a20aba7f438 100644
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -342,7 +342,6 @@ source_set("browser") {
"geolocation/network_location_request.h",
"power_usage_monitor_impl.cc",
"power_usage_monitor_impl.h",
- "renderer_host/begin_frame_observer_proxy.cc",
"tracing/tracing_ui.cc",
"tracing/tracing_ui.h",
@@ -368,6 +367,11 @@ 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/22 21:11:59 you can just move this into the else-path below wh
+ ]
+ }
deps -= [ "//device/battery" ]
deps += [
"//content/public/android:jni",
@@ -411,6 +415,114 @@ 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",
+
+ "android/animation_utils.h",
+ "android/background_sync_launcher_android.cc",
+ "android/background_sync_launcher_android.h",
+ # "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",
no sievers 2015/10/22 21:11:59 keep browser_surface_texture_manager.cc./.h
mfomitchev 2015/11/03 22:23:19 Done.
+ "android/browser_surface_texture_manager.h",
+
+ # "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/22 21:11:59 keep content_protocol_handler_impl.cc/.h
mfomitchev 2015/11/03 22:23:19 Done.
+ "android/content_readback_handler.cc",
+ "android/content_readback_handler.h",
+ # "android/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",
no sievers 2015/10/22 21:11:59 keep in_process_surface_texture_manager.cc/.h
mfomitchev 2015/11/03 22:23:19 Done.
+ "android/in_process_surface_texture_manager.h",
+ "android/interstitial_page_delegate_android.cc",
+ "android/interstitial_page_delegate_android.h",
+ "android/load_url_params.cc",
+ "android/load_url_params.h",
+ "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",
+ "android/url_request_content_job.cc",
+ "android/url_request_content_job.h",
+ "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",
no sievers 2015/10/22 21:11:59 I think we can keep browser_media_player_manager.c
mfomitchev 2015/11/03 22:23:19 Done.
+ "media/android/media_session.h",
+ "media/android/media_session.cc",
+
+ "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",
+ "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",
+ ]
+ }
} else { # Not aura.
sources -= [
"renderer_host/compositor_resize_lock_aura.cc",
« no previous file with comments | « components/tracing/trace_config_file.cc ('k') | content/browser/accessibility/accessibility_tree_formatter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698