Aura on Android: content/browser

content/browser/BUILD.gn

Index: content/browser/BUILD.gn
diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
index a334f00988be6911cb0f0cbd305478fd40a10d6a..776a6cb7a320c2021d7c49a0658f45efa0805ca8 100644
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -341,7 +341,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",
 
@@ -367,6 +366,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/11/02 22:27:15]

you can just move this into the else-path below where we exclude
compositor_resize_lock_aura.cc and other stuff (line 509 right)

[mfomitchev, 2015/11/03 22:23:19]

Hmm... currently it is only excluded on Android and iOS. If I move it, it will
be excluded on all non-Aura platforms, e.g. Mac. BTW we should probably also
exclude the .h file, not just the .cc?

[no sievers, 2015/11/04 01:59:31]

It's only used from RWHVAura, so I'd remove it below where we remove
render_widget_host_view_aura. I think it just happens to compile on Mac, because
Mac depends on ui::Compositor (which BeginFrameObserverProxy depends on).

You also have to exclude begin_frame_observer_proxy_unittest.cc, which you can
probably just do from where we remove render_wiget_host_view_aura_unittests.cc
sounds good

+      ]
+    }
     deps -= [ "//device/battery" ]
     deps += [
       "//content/public/android:jni",
@@ -411,6 +415,97 @@ source_set("browser") {
       "//ui/strings",
       "//ui/wm",
     ]
+
+    if (is_android) {
+      sources-= [

[no sievers, 2015/11/02 22:27:15]

Can you put these into 'android_browser_non_aura_sources' in the gypi and then
add them conditionally (!use_aura) above where we add the others:

if (is_android) {
 328     sources +=  ...

[mfomitchev, 2015/11/03 22:23:19]

Done.

+        "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/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",
+        
+  #      "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",
+        "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/in_process/context_provider_in_process.cc",
+        "android/in_process/context_provider_in_process.h",

[no sievers, 2015/11/02 22:27:15]

android/in_process/* you can now exclude by putting an if(!use_aura) above where
we add 'android_in_process_browser_sources'.

[mfomitchev, 2015/11/03 22:23:19]

Done.

+        "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_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",
+        "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/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",
+#        "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",