Aura on Android: content/browser

content/browser/android/content_video_view.cc

Index: content/browser/android/content_video_view.cc
diff --git a/content/browser/android/content_video_view.cc b/content/browser/android/content_video_view.cc
index 8a9eb4298b10848f5ef4681a1de12d339c415a08..24d4647e11a00d5f7197d4695eac82e39885d221 100644
--- a/content/browser/android/content_video_view.cc
+++ b/content/browser/android/content_video_view.cc
@@ -8,7 +8,6 @@
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram.h"
-#include "content/browser/android/content_view_core_impl.h"
 #include "content/browser/media/android/browser_media_player_manager.h"
 #include "content/browser/power_save_blocker_impl.h"
 #include "content/common/android/surface_texture_peer.h"
@@ -16,6 +15,10 @@
 #include "content/public/common/content_switches.h"
 #include "jni/ContentVideoView_jni.h"
 
+#if !defined(USE_AURA)
+#include "content/browser/android/content_view_core_impl.h"
+#endif
+
 using base::android::AttachCurrentThread;
 using base::android::CheckException;
 using base::android::ScopedJavaGlobalRef;
@@ -198,11 +201,17 @@ ScopedJavaLocalRef<jobject> ContentVideoView::GetJavaObject(JNIEnv* env) {
 }
 
 JavaObjectWeakGlobalRef ContentVideoView::CreateJavaObject() {
-  ContentViewCore* content_view_core = manager_->GetContentViewCore();
+
   JNIEnv* env = AttachCurrentThread();
+  base::android::ScopedJavaLocalRef<jobject> j_content_view_core;
+
+  // TODO(mfomitchev): Support fullscreen video underlay on Android Aura.
+  // crbug.com/548024
+#if !defined(USE_AURA)
+  ContentViewCore* content_view_core = manager_->GetContentViewCore();
+  j_content_view_core = content_view_core->GetJavaObject();
+#endif
 
-  base::android::ScopedJavaLocalRef<jobject> j_content_view_core =
-      content_view_core->GetJavaObject();
   if (j_content_view_core.is_null())
     return JavaObjectWeakGlobalRef(env, nullptr);