content/public/android/java/src/org/chromium/content/browser/ContentVideoView.java - Issue 1569643002: Reland Pull the Activity context from WindowAndroid if possible

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/public/android/java/src/org/chromium/content/browser/ContentVideoView.java

Issue 1569643002: Reland Pull the Activity context from WindowAndroid if possible (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Revert the changes in ChromeWindow as they are not needed anymore Created 4 years, 11 months 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

« no previous file with comments | « components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/ColorChooserAndroid.java ('k') | content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/public/android/java/src/org/chromium/content/browser/ContentVideoView.java

diff --git a/content/public/android/java/src/org/chromium/content/browser/ContentVideoView.java b/content/public/android/java/src/org/chromium/content/browser/ContentVideoView.java

index 76db5cb09e02b58dcea0cf94e454a89ec5c74868..52e00d0c59eee54041f9002022569e7ca38b6bdc 100644

--- a/content/public/android/java/src/org/chromium/content/browser/ContentVideoView.java

+++ b/content/public/android/java/src/org/chromium/content/browser/ContentVideoView.java

@@ -26,6 +26,7 @@ import org.chromium.base.Log;

import org.chromium.base.ThreadUtils;

import org.chromium.base.annotations.CalledByNative;

import org.chromium.base.annotations.JNINamespace;

+import org.chromium.ui.base.WindowAndroid;

/**

* This class implements accelerated fullscreen video playback using surface view.

@@ -227,7 +228,7 @@ public class ContentVideoView extends FrameLayout

mCurrentState = STATE_ERROR;

- if (ContentViewCore.activityFromContext(getContext()) == null) {

+ if (WindowAndroid.activityFromContext(getContext()) == null) {

Log.w(TAG, "Unable to show alert dialog because it requires an activity context");

return;

}