Aura on Android: content/browser

content/browser/android/child_process_launcher_android.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/android/child_process_launcher_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #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 "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"
-#include "ui/gl/android/surface_texture.h"
+#endif
 
 using base::android::AttachCurrentThread;
 using base::android::ToJavaArrayOfStrings;
 using base::android::ScopedJavaGlobalRef;
 using base::android::ScopedJavaLocalRef;
 using content::StartChildProcessCallback;
 
 namespace content {
 
 namespace {
@@ skipping 13 matching lines @@
       break;
     }
     it.Advance();
   }
   if (!render_process_id) {
     DVLOG(1) << "Cannot find render process for render_process_handle "
              << render_process_handle;
     return;
   }
 
+#if !defined(USE_AURA)
   RenderFrameHostImpl* frame =
       RenderFrameHostImpl::FromID(render_process_id, render_frame_id);
   if (!frame) {
     DVLOG(1) << "Cannot find frame for render_frame_id " << render_frame_id;
     return;
   }
 
   WebContentsImpl* web_contents =
       static_cast<WebContentsImpl*>(WebContents::FromRenderFrameHost(frame));
   BrowserMediaPlayerManager* player_manager =
       web_contents->media_web_contents_observer()->GetMediaPlayerManager(frame);
   if (!player_manager) {
     DVLOG(1) << "Cannot find the media player manager for frame " << frame;
     return;
   }
 
   media::MediaPlayerAndroid* player = player_manager->GetPlayer(player_id);
   if (!player) {
     DVLOG(1) << "Cannot find media player for player_id " << player_id;
     return;
   }
 
   if (player != player_manager->GetFullscreenPlayer()) {
     gfx::ScopedJavaSurface scoped_surface(surface);
     player->SetVideoSurface(scoped_surface.Pass());
   }
+#endif
 }
 
 }  // anonymous namespace
 
 // Called from ChildProcessLauncher.java when the ChildProcess was
 // started.
 // |client_context| is the pointer to StartChildProcessCallback which was
 // passed in from StartChildProcess.
 // |handle| is the processID of the child process as originated in Java, 0 if
 // the ChildProcess could not be created.
@@ skipping 137 matching lines @@
 jboolean IsSingleProcess(JNIEnv* env, const JavaParamRef<jclass>& clazz) {
   return base::CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kSingleProcess);
 }
 
 bool RegisterChildProcessLauncher(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace content