android_webview/java/src/org/chromium/android_webview/AwContents.java - Issue 756983002: [android_webview] Correctly handle ContextWrapper in AwContents.

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: android_webview/java/src/org/chromium/android_webview/AwContents.java

Issue 756983002: [android_webview] Correctly handle ContextWrapper in AwContents. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 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

Index: android_webview/java/src/org/chromium/android_webview/AwContents.java

diff --git a/android_webview/java/src/org/chromium/android_webview/AwContents.java b/android_webview/java/src/org/chromium/android_webview/AwContents.java

index 3eedfeded1d65cf19ba56c0d8552dbe5ec42e499..f424a57aa25ffb149aeef292879f7bf8de24d595 100644

--- a/android_webview/java/src/org/chromium/android_webview/AwContents.java

+++ b/android_webview/java/src/org/chromium/android_webview/AwContents.java

@@ -793,8 +793,9 @@ public class AwContents implements SmartClipProvider {

long nativeWebContents = nativeGetWebContents(mNativeAwContents);

- mWindowAndroid = mContext instanceof Activity

- ? new ActivityWindowAndroid((Activity) mContext)

+ Activity activity = ContentViewCore.activityFromContext(mContext);

+ mWindowAndroid = activity != null

+ ? new ActivityWindowAndroid(activity)

: new WindowAndroid(mContext.getApplicationContext());

mContentViewCore = createAndInitializeContentViewCore(

mContainerView, mContext, mInternalAccessAdapter, nativeWebContents,

« no previous file with comments | « no previous file | content/public/android/java/src/org/chromium/content/browser/ContentVideoView.java » ('j') | no next file with comments »