Aura on Android: content/browser

content/browser/android/child_process_launcher_android.cc

Index: content/browser/android/child_process_launcher_android.cc
diff --git a/content/browser/android/child_process_launcher_android.cc b/content/browser/android/child_process_launcher_android.cc
index 44e1bd38f6dd2ae8a0ce7faac3d3b0b17f31b373..c67607c29f14b3f19b5633f90d19d8731ba9a7ff 100644
--- a/content/browser/android/child_process_launcher_android.cc
+++ b/content/browser/android/child_process_launcher_android.cc
@@ -9,17 +9,21 @@
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/browser/frame_host/render_frame_host_impl.h"
-#include "content/browser/media/android/browser_media_player_manager.h"
-#include "content/browser/media/media_web_contents_observer.h"
-#include "content/browser/renderer_host/compositor_impl_android.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/common/content_switches.h"
 #include "jni/ChildProcessLauncher_jni.h"
-#include "media/base/android/media_player_android.h"
 #include "ui/gl/android/surface_texture.h"
 

[no sievers, 2015/10/22 20:55:40]

revert changes to this file

[mfomitchev, 2015/11/02 21:51:15]

Just left an ifdef in SetSurfacePeer.

+
+#if !defined(USE_AURA)
+#include "content/browser/media/android/browser_media_player_manager.h"
+#include "content/browser/media/media_web_contents_observer.h"
+#include "content/browser/renderer_host/compositor_impl_android.h"
+#include "media/base/android/media_player_android.h"
+#endif
+
 using base::android::AttachCurrentThread;
 using base::android::ToJavaArrayOfStrings;
 using base::android::ScopedJavaGlobalRef;
@@ -52,6 +56,7 @@ static void SetSurfacePeer(
     return;
   }
 
+#if !defined(USE_AURA)
   RenderFrameHostImpl* frame =
       RenderFrameHostImpl::FromID(render_process_id, render_frame_id);
   if (!frame) {
@@ -78,6 +83,7 @@ static void SetSurfacePeer(
     gfx::ScopedJavaSurface scoped_surface(surface);
     player->SetVideoSurface(scoped_surface.Pass());
   }
+#endif
 }
 
 }  // anonymous namespace