| 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 942747012ae46cbd139ebfed045d05928b4e6efc..6720e7322988eab8f8479bdbf545471d5500faf5 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
|
| @@ -85,7 +85,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 AndroidBrowserProcessInitException {
|
| return ContentViewCore.enableMultiProcess(context, maxRendererProcesses);
|
| }
|
|
|
| @@ -97,7 +98,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 AndroidBrowserProcessInitException {
|
| return ContentViewCore.initChromiumBrowserProcess(context, maxRendererProcesses);
|
| }
|
|
|
| @@ -117,7 +119,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 AndroidBrowserProcessInitException {
|
| return newInstance(context, nativeWebContents, nativeWindow, null,
|
| android.R.attr.webViewStyle, personality);
|
| }
|
| @@ -132,7 +134,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 AndroidBrowserProcessInitException {
|
| // 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,
|
| @@ -150,13 +153,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 AndroidBrowserProcessInitException {
|
| 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 AndroidBrowserProcessInitException {
|
| if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN) {
|
| return new ContentView(context, nativeWebContents, nativeWindow, attrs, defStyle,
|
| personality);
|
| @@ -167,7 +172,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 AndroidBrowserProcessInitException {
|
| super(context, attrs, defStyle);
|
|
|
| mContentViewCore = new ContentViewCore(context, personality);
|
|
|