content/public/android/java/src/org/chromium/content/browser/ChildProcessConnectionImpl.java - Issue 2049843004: Upstream: Renderers are running in WebAPKs.

Unified Diff: content/public/android/java/src/org/chromium/content/browser/ChildProcessConnectionImpl.java

Issue 2049843004: Upstream: Renderers are running in WebAPKs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Always check command line flags in getNum(Class)ofService(). Created 4 years, 6 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

« chrome/android/java/src/org/chromium/chrome/browser/init/ChromeBrowserInitializer.java ('K') | « content/public/android/java/src/org/chromium/content/app/ChildProcessServiceImpl.java ('k') | content/public/android/java/src/org/chromium/content/browser/ChildProcessLauncher.java » ('j') | content/public/android/java/src/org/chromium/content/browser/ChildProcessLauncher.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/public/android/java/src/org/chromium/content/browser/ChildProcessConnectionImpl.java

diff --git a/content/public/android/java/src/org/chromium/content/browser/ChildProcessConnectionImpl.java b/content/public/android/java/src/org/chromium/content/browser/ChildProcessConnectionImpl.java

index 362cf7726dd633ff1cf7d0c5f714b719ea1acaca..0cbb436769d1314cd28e56d24dba154b02ede8cc 100644

--- a/content/public/android/java/src/org/chromium/content/browser/ChildProcessConnectionImpl.java

+++ b/content/public/android/java/src/org/chromium/content/browser/ChildProcessConnectionImpl.java

@@ -4,6 +4,7 @@

package org.chromium.content.browser;

+import android.app.Service;

import android.content.ComponentName;

import android.content.Context;

import android.content.Intent;

@@ -19,7 +20,6 @@ import org.chromium.base.Log;

import org.chromium.base.ThreadUtils;

import org.chromium.base.TraceEvent;

import org.chromium.base.VisibleForTesting;

-import org.chromium.content.app.ChildProcessService;

import org.chromium.content.app.ChromiumLinkerParams;

import org.chromium.content.common.IChildProcessCallback;

import org.chromium.content.common.IChildProcessService;

@@ -34,7 +34,7 @@ public class ChildProcessConnectionImpl implements ChildProcessConnection {

private final int mServiceNumber;

private final boolean mInSandbox;

private final ChildProcessConnection.DeathCallback mDeathCallback;

- private final Class<? extends ChildProcessService> mServiceClass;

+ private final Class<? extends Service> mServiceClass;

private final ComponentName mServiceName;

// Synchronization: While most internal flow occurs on the UI thread, the public API

@@ -211,7 +211,7 @@ public class ChildProcessConnectionImpl implements ChildProcessConnection {

ChildProcessConnectionImpl(Context context, int number, boolean inSandbox,

ChildProcessConnection.DeathCallback deathCallback,

- Class<? extends ChildProcessService> serviceClass,

+ Class<? extends Service> serviceClass,

ChromiumLinkerParams chromiumLinkerParams,

boolean alwaysInForeground,

ChildProcessCreationParams creationParams) {