| Index: content/public/android/java/src/org/chromium/content/browser/ContentView.java
|
| diff --git a/content/public/android/java/src/org/chromium/content/browser/ContentView.java b/content/public/android/java/src/org/chromium/content/browser/ContentView.java
|
| index 27b937a39f6754ca0b3d25d89fe6565cd1cb1197..3ca63ff83674116b44e38ea0833c0316dc1f74c3 100644
|
| --- a/content/public/android/java/src/org/chromium/content/browser/ContentView.java
|
| +++ b/content/public/android/java/src/org/chromium/content/browser/ContentView.java
|
| @@ -21,6 +21,7 @@ import android.view.inputmethod.EditorInfo;
|
| import android.view.inputmethod.InputConnection;
|
| import android.widget.FrameLayout;
|
|
|
| +import org.chromium.content.common.ProcessInitException;
|
| import org.chromium.content.common.TraceEvent;
|
| import org.chromium.ui.gfx.NativeWindow;
|
|
|
| @@ -69,7 +70,8 @@ public class ContentView extends FrameLayout implements ContentViewCore.Internal
|
| * maximum number of allowed renderers is capped by MAX_RENDERERS_LIMIT.
|
| * @return Whether the process actually needed to be initialized (false if already running).
|
| */
|
| - public static boolean enableMultiProcess(Context context, int maxRendererProcesses) {
|
| + public static boolean enableMultiProcess(Context context, int maxRendererProcesses)
|
| + throws ProcessInitException {
|
| return ContentViewCore.enableMultiProcess(context, maxRendererProcesses);
|
| }
|
|
|
| @@ -81,7 +83,8 @@ public class ContentView extends FrameLayout implements ContentViewCore.Internal
|
| * @param maxRendererProcesses Same as ContentView.enableMultiProcess()
|
| * @return Whether the process actually needed to be initialized (false if already running).
|
| */
|
| - public static boolean initChromiumBrowserProcess(Context context, int maxRendererProcesses) {
|
| + public static boolean initChromiumBrowserProcess(Context context, int maxRendererProcesses)
|
| + throws ProcessInitException {
|
| return ContentViewCore.initChromiumBrowserProcess(context, maxRendererProcesses);
|
| }
|
|
|
| @@ -97,7 +100,7 @@ public class ContentView extends FrameLayout implements ContentViewCore.Internal
|
| * @return A ContentView instance.
|
| */
|
| public static ContentView newInstance(Context context, int nativeWebContents,
|
| - NativeWindow nativeWindow, int personality) {
|
| + NativeWindow nativeWindow, int personality) throws ProcessInitException {
|
| return newInstance(context, nativeWebContents, nativeWindow, null,
|
| android.R.attr.webViewStyle, personality);
|
| }
|
| @@ -112,7 +115,8 @@ public class ContentView extends FrameLayout implements ContentViewCore.Internal
|
| * @return A ContentView instance.
|
| */
|
| public static ContentView newInstance(Context context, int nativeWebContents,
|
| - NativeWindow nativeWindow, AttributeSet attrs) {
|
| + NativeWindow nativeWindow, AttributeSet attrs)
|
| + throws ProcessInitException {
|
| // TODO(klobag): use the WebViewStyle as the default style for now. It enables scrollbar.
|
| // When ContentView is moved to framework, we can define its own style in the res.
|
| return newInstance(context, nativeWebContents, nativeWindow, attrs,
|
| @@ -130,13 +134,15 @@ public class ContentView extends FrameLayout implements ContentViewCore.Internal
|
| * @return A ContentView instance.
|
| */
|
| public static ContentView newInstance(Context context, int nativeWebContents,
|
| - NativeWindow nativeWindow, AttributeSet attrs, int defStyle) {
|
| + NativeWindow nativeWindow, AttributeSet attrs, int defStyle)
|
| + throws ProcessInitException {
|
| return newInstance(context, nativeWebContents, nativeWindow, attrs, defStyle,
|
| PERSONALITY_VIEW);
|
| }
|
|
|
| private static ContentView newInstance(Context context, int nativeWebContents,
|
| - NativeWindow nativeWindow, AttributeSet attrs, int defStyle, int personality) {
|
| + NativeWindow nativeWindow, AttributeSet attrs, int defStyle, int personality)
|
| + throws ProcessInitException {
|
| if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN) {
|
| return new ContentView(context, nativeWebContents, nativeWindow, attrs, defStyle,
|
| personality);
|
| @@ -147,7 +153,8 @@ public class ContentView extends FrameLayout implements ContentViewCore.Internal
|
| }
|
|
|
| protected ContentView(Context context, int nativeWebContents, NativeWindow nativeWindow,
|
| - AttributeSet attrs, int defStyle, int personality) {
|
| + AttributeSet attrs, int defStyle, int personality)
|
| + throws ProcessInitException {
|
| super(context, attrs, defStyle);
|
|
|
| mContentViewCore = new ContentViewCore(context, personality);
|
|
|