Aura on Android: content/browser

content/browser/android/content_video_view.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/content_video_view.h"
 
 #include "base/command_line.h"
 #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"

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

also don't include content_view_core_impl.h on AURA.

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

Done.

 #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"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/common/content_switches.h"
 #include "jni/ContentVideoView_jni.h"
 
 using base::android::AttachCurrentThread;
 using base::android::CheckException;
 using base::android::ScopedJavaGlobalRef;
@@ skipping 169 matching lines @@
       FROM_HERE,
       base::Bind(&ContentVideoView::UpdateMediaMetadata,
                  weak_factory_.GetWeakPtr()));
 }
 
 ScopedJavaLocalRef<jobject> ContentVideoView::GetJavaObject(JNIEnv* env) {
   return j_content_video_view_.get(env);
 }
 
 JavaObjectWeakGlobalRef ContentVideoView::CreateJavaObject() {
+
+  JNIEnv* env = AttachCurrentThread();
+  base::android::ScopedJavaLocalRef<jobject> j_content_view_core;
+
+#if !defined(USE_AURA)

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

can you TODO(crbug.com/548024)?

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

Done.

   ContentViewCore* content_view_core = manager_->GetContentViewCore();
-  JNIEnv* env = AttachCurrentThread();
+  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);
 
   return JavaObjectWeakGlobalRef(
       env,
       Java_ContentVideoView_createContentVideoView(
           env,
           j_content_view_core.obj(),
           reinterpret_cast<intptr_t>(this)).obj());
 }
 }  // namespace content