diff options
| author | mkosiba <mkosiba@chromium.org> | 2014-11-26 02:50:50 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-11-26 10:51:05 +0000 |
| commit | 214620e444390c1442a62d79499a82562ebe492d (patch) | |
| tree | eb83379f9e9bc01edff6f0d68a7c277f4fb26724 /android_webview/java/src/org/chromium | |
| parent | fd1ed6c36a08666dea471546c6e63d92997e815f (diff) | |
| download | chromium_src-214620e444390c1442a62d79499a82562ebe492d.zip chromium_src-214620e444390c1442a62d79499a82562ebe492d.tar.gz chromium_src-214620e444390c1442a62d79499a82562ebe492d.tar.bz2 | |
[android_webview] Correctly handle ContextWrapper in AwContents.
Having a ContextWrapper passed in as the AwContents Context parameter
was causing us to use the wrong kind of window object which in turn
resulted in popup dialogs not being displayed.
BUG=434695
Review URL: https://codereview.chromium.org/756983002
Cr-Commit-Position: refs/heads/master@{#305796}
Diffstat (limited to 'android_webview/java/src/org/chromium')
| -rw-r--r-- | android_webview/java/src/org/chromium/android_webview/AwContents.java | 5 |
1 files changed, 3 insertions, 2 deletions
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 3eedfed..f424a57 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, |