summaryrefslogtreecommitdiffstats
path: root/content/shell/android
diff options
context:
space:
mode:
authormichaelbai@chromium.org <michaelbai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-11 21:46:28 +0000
committermichaelbai@chromium.org <michaelbai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-11 21:46:28 +0000
commit0ce1a85c3e610fda137362461014aec56c7dc66d (patch)
tree7978e6e3dae776ffae4cb12652ca073df51be438 /content/shell/android
parent0c9e1944a2a2a8870a267cb05711d96fcb2652a4 (diff)
downloadchromium_src-0ce1a85c3e610fda137362461014aec56c7dc66d.zip
chromium_src-0ce1a85c3e610fda137362461014aec56c7dc66d.tar.gz
chromium_src-0ce1a85c3e610fda137362461014aec56c7dc66d.tar.bz2
Remove ContentViewCore.enableMultiProcess etc.
BUG= Review URL: https://chromiumcodereview.appspot.com/11926028 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181765 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/shell/android')
-rw-r--r--content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java b/content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java
index 0ce99d8..f72d1fb 100644
--- a/content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java
+++ b/content/shell/android/shell_apk/src/org/chromium/content_shell_apk/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;
@@ -76,7 +77,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 = ShellManager.DEFAULT_SHELL_URL;
if (savedInstanceState != null
&& savedInstanceState.containsKey(ACTIVE_SHELL_URL_KEY)) {