| 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 2e83ca646139dcf0e266578dcb2567cd0688dc21..5ca0df1aab4fe5c438c27f11601dde6e539bdcd6 100644
|
| --- a/android_webview/java/src/org/chromium/android_webview/AwContents.java
|
| +++ b/android_webview/java/src/org/chromium/android_webview/AwContents.java
|
| @@ -25,6 +25,7 @@ import android.webkit.ValueCallback;
|
| import org.chromium.base.CalledByNative;
|
| import org.chromium.base.JNINamespace;
|
| import org.chromium.base.ThreadUtils;
|
| +import org.chromium.content.browser.AndroidBrowserProcessInitException;
|
| import org.chromium.content.browser.ContentSettings;
|
| import org.chromium.content.browser.ContentViewCore;
|
| import org.chromium.content.browser.LoadUrlParams;
|
| @@ -273,7 +274,8 @@ public class AwContents {
|
| ContentViewCore.InternalAccessDelegate internalAccessAdapter,
|
| AwContentsClient contentsClient,
|
| NativeWindow nativeWindow, boolean privateBrowsing,
|
| - boolean isAccessFromFileURLsGrantedByDefault) {
|
| + boolean isAccessFromFileURLsGrantedByDefault)
|
| + throws AndroidBrowserProcessInitException {
|
| mContainerView = containerView;
|
| mInternalAccessAdapter = internalAccessAdapter;
|
| // Note that ContentViewCore must be set up before AwContents, as ContentViewCore
|
| @@ -422,13 +424,15 @@ public class AwContents {
|
| * Called on the "source" AwContents that is opening the popup window to
|
| * provide the AwContents to host the pop up content.
|
| */
|
| - public void supplyContentsForPopup(AwContents newContents) {
|
| + public void supplyContentsForPopup(AwContents newContents)
|
| + throws AndroidBrowserProcessInitException {
|
| int popupWebContents = nativeReleasePopupWebContents(mNativeAwContents);
|
| assert popupWebContents != 0;
|
| newContents.setNewWebContents(popupWebContents);
|
| }
|
|
|
| - private void setNewWebContents(int newWebContentsPtr) {
|
| + private void setNewWebContents(int newWebContentsPtr)
|
| + throws AndroidBrowserProcessInitException {
|
| // When setting a new WebContents, we new up a ContentViewCore that will
|
| // wrap it and then swap it.
|
| ContentViewCore newCore = new ContentViewCore(mContainerView.getContext(),
|
|
|