NOT FOR REVIEW: Aura on Android

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"
+
+
+#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 {
 
 // Pass a java surface object to the MediaPlayerAndroid object
 // identified by render process handle, render frame ID and player ID.
 static void SetSurfacePeer(
     const base::android::JavaRef<jobject>& surface,
     base::ProcessHandle render_process_handle,
     int render_frame_id,
     int player_id) {
   int render_process_id = 0;
   RenderProcessHost::iterator it = RenderProcessHost::AllHostsIterator();
   while (!it.IsAtEnd()) {
     if (it.GetCurrentValue()->GetHandle() == render_process_handle) {
       render_process_id = it.GetCurrentValue()->GetID();
       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 71 matching lines @@
 }
 
 void SetChildProcessInForeground(base::ProcessHandle handle,
     bool in_foreground) {
   JNIEnv* env = AttachCurrentThread();
   DCHECK(env);
   return Java_ChildProcessLauncher_setInForeground(env,
       static_cast<jint>(handle), static_cast<jboolean>(in_foreground));
 }
 
+//#if !defined(USE_AURA)
 void EstablishSurfacePeer(
     JNIEnv* env, jclass clazz,
     jint pid, jobject surface, jint primary_id, jint secondary_id) {
   ScopedJavaGlobalRef<jobject> jsurface;
   jsurface.Reset(env, surface);
   if (jsurface.is_null())
     return;
 
   DCHECK(!BrowserThread::CurrentlyOn(BrowserThread::UI));
   BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, base::Bind(
@@ skipping 32 matching lines @@
 }
 
 gfx::ScopedJavaSurface GetSurfaceTextureSurface(int surface_texture_id,
                                                 int client_id) {
   JNIEnv* env = AttachCurrentThread();
   DCHECK(env);
   return gfx::ScopedJavaSurface::AcquireExternalSurface(
       Java_ChildProcessLauncher_getSurfaceTextureSurface(
           env, surface_texture_id, client_id).obj());
 }
+//#endif
 
 jboolean IsSingleProcess(JNIEnv* env, jclass clazz) {
   return base::CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kSingleProcess);
 }
 
 bool RegisterChildProcessLauncher(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace content