content/browser/android/content_video_view.cc - Issue 1411503005: Aura on Android: content/browser

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/android/content_video_view.cc

Issue 1411503005: Aura on Android: content/browser (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@auraclank_upstream_select_file

Patch Set: Addressing some feedback. Fixes for content/child and content/public/browser targets. Created 5 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« content/browser/android/browser_jni_registrar.cc ('K') | « content/browser/android/content_startup_flags.cc ('k') | content/browser/background_sync/background_sync_manager.cc » ('j') | content/browser/browser_main_loop.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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..996eb9a6ad205b8ff388ddf250aba8168bc328ff 100644

--- a/content/browser/android/content_video_view.cc

+++ b/content/browser/android/content_video_view.cc

@@ -198,11 +198,15 @@ 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;

+#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();

+ 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);