content/shell/android/java/src/org/chromium/content_shell/ContentShellActivity.java - Issue 11567061: Throw exception when initialization failed.

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: content/shell/android/java/src/org/chromium/content_shell/ContentShellActivity.java

Issue 11567061: Throw exception when initialization failed. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

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

« content/public/android/java/src/org/chromium/content/browser/AndroidBrowserProcessInitException.java ('K') | « content/public/android/java/src/org/chromium/content/browser/JellyBeanContentView.java ('k') | content/shell/android/java/src/org/chromium/content_shell/Shell.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/shell/android/java/src/org/chromium/content_shell/ContentShellActivity.java

diff --git a/content/shell/android/java/src/org/chromium/content_shell/ContentShellActivity.java b/content/shell/android/java/src/org/chromium/content_shell/ContentShellActivity.java

index bddb70f316753ae564bb10700aea9dad876fadb3..a12129de0a881982241cedaa83f04014c4da0851 100644

--- a/content/shell/android/java/src/org/chromium/content_shell/ContentShellActivity.java

+++ b/content/shell/android/java/src/org/chromium/content_shell/ContentShellActivity.java

@@ -14,6 +14,7 @@ import android.view.KeyEvent;

import org.chromium.base.ChromiumActivity;

import org.chromium.content.app.LibraryLoader;

import org.chromium.content.browser.ActivityContentVideoViewDelegate;

+import org.chromium.content.browser.AndroidBrowserProcessInitException;

import org.chromium.content.browser.ContentVideoView;

import org.chromium.content.browser.ContentView;

import org.chromium.content.browser.DeviceUtils;

@@ -66,13 +67,18 @@ public class ContentShellActivity extends ChromiumActivity {

mShellManager.setStartupUrl(Shell.sanitizeUrl(startupUrl));

}

- if (!ContentView.enableMultiProcess(this, ContentView.MAX_RENDERERS_AUTOMATIC)) {

- String shellUrl = DEFAULT_SHELL_URL;

- if (savedInstanceState != null

+ try {

+ if (!ContentView.enableMultiProcess(this, ContentView.MAX_RENDERERS_AUTOMATIC)) {

+ String shellUrl = DEFAULT_SHELL_URL;

+ if (savedInstanceState != null

&& savedInstanceState.containsKey(ACTIVE_SHELL_URL_KEY)) {

- shellUrl = savedInstanceState.getString(ACTIVE_SHELL_URL_KEY);

+ shellUrl = savedInstanceState.getString(ACTIVE_SHELL_URL_KEY);

+ }

+ mShellManager.launchShell(shellUrl);

}

- mShellManager.launchShell(shellUrl);

+ } catch (AndroidBrowserProcessInitException e) {

+ Log.e(TAG, "ContentView initialization failed.", e);

+ finish();

}