content/shell/android/java/src/org/chromium/content_shell/ContentShellActivity.java - Issue 11926028: Remove ContentViewCore.enableMultiProcess etc.

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 11926028: Remove ContentViewCore.enableMultiProcess etc. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: combine 2 init methods to 1 Created 7 years, 11 months 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/AndroidBrowserProcess.java ('K') | « content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java ('k') | no next file » | 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 cd3e546e35c5da3122ba26f3338fd8b96b881529..519c3c72242101c87304e99426a63ee4f792b6a5 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

@@ -17,6 +17,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.AndroidBrowserProcess;

import org.chromium.content.browser.ContentVideoView;

import org.chromium.content.browser.ContentView;

import org.chromium.content.browser.DeviceUtils;

@@ -75,7 +76,7 @@ public class ContentShellActivity extends ChromiumActivity {

if (!TextUtils.isEmpty(startupUrl)) {

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

}

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

+ if (!AndroidBrowserProcess.init(this, AndroidBrowserProcess.MAX_RENDERERS_AUTOMATIC)) {

String shellUrl = DEFAULT_SHELL_URL;

if (savedInstanceState != null

&& savedInstanceState.containsKey(ACTIVE_SHELL_URL_KEY)) {