content/public/android/java/src/org/chromium/content/browser/ChildProcessConnectionImpl.java - Issue 2107573002: Move WebApkSandboxedProcessService to webapk/shell_apk

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/public/android/java/src/org/chromium/content/browser/ChildProcessConnectionImpl.java

Issue 2107573002: Move WebApkSandboxedProcessService to webapk/shell_apk (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Merge branch 'master' into sandbox 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

« no previous file with comments | « chrome/android/webapk/shell_apk/src/org/chromium/webapk/shell_apk/WebApkSandboxedProcessService2.java ('k') | content/public/android/java/src/org/chromium/content/browser/ChildProcessLauncher.java » ('j') | no next file with comments »
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 0cbb436769d1314cd28e56d24dba154b02ede8cc..2c085851a7fb6447848b20075ce0aeac9e433bd4 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,7 +4,6 @@

package org.chromium.content.browser;

-import android.app.Service;

import android.content.ComponentName;

import android.content.Context;

import android.content.Intent;

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

private final int mServiceNumber;

private final boolean mInSandbox;

private final ChildProcessConnection.DeathCallback mDeathCallback;

- 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 +209,7 @@ public class ChildProcessConnectionImpl implements ChildProcessConnection {

ChildProcessConnectionImpl(Context context, int number, boolean inSandbox,

ChildProcessConnection.DeathCallback deathCallback,

- Class<? extends Service> serviceClass,

+ String serviceClassName,

ChromiumLinkerParams chromiumLinkerParams,

boolean alwaysInForeground,

ChildProcessCreationParams creationParams) {

@@ -219,10 +217,9 @@ public class ChildProcessConnectionImpl implements ChildProcessConnection {

mServiceNumber = number;

mInSandbox = inSandbox;

mDeathCallback = deathCallback;

- mServiceClass = serviceClass;

String packageName =

creationParams != null ? creationParams.getPackageName() : context.getPackageName();

- mServiceName = new ComponentName(packageName, mServiceClass.getName() + mServiceNumber);

+ mServiceName = new ComponentName(packageName, serviceClassName + mServiceNumber);

mLinkerParams = chromiumLinkerParams;

mAlwaysInForeground = alwaysInForeground;

mCreationParams = creationParams;