| Index: content/public/android/java/src/org/chromium/content/browser/ChildProcessCreationParams.java
|
| diff --git a/content/public/android/java/src/org/chromium/content/browser/ChildProcessCreationParams.java b/content/public/android/java/src/org/chromium/content/browser/ChildProcessCreationParams.java
|
| index a8fd972bb4d0cf249b8c33f0fdb5934c514ba76b..df6ae6e08786cd694d0d6c3f4a7b4aeffbc3c126 100644
|
| --- a/content/public/android/java/src/org/chromium/content/browser/ChildProcessCreationParams.java
|
| +++ b/content/public/android/java/src/org/chromium/content/browser/ChildProcessCreationParams.java
|
| @@ -18,8 +18,12 @@ public class ChildProcessCreationParams {
|
| private final String mPackageName;
|
| private final boolean mIsExternalService;
|
| private final int mLibraryProcessType;
|
| + private final String[] mAdditionalCommandLine;
|
| +
|
| private static final String EXTRA_LIBRARY_PROCESS_TYPE =
|
| "org.chromium.content.common.child_service_params.library_process_type";
|
| + private static final String EXTRA_ADDITIONAL_COMMAND_LINE =
|
| + "org.chromium.content.common.child_service_params.additional_command_line";
|
|
|
| private static volatile ChildProcessCreationParams sChildProcessCreationParams;
|
|
|
| @@ -32,15 +36,17 @@ public class ChildProcessCreationParams {
|
| }
|
|
|
| public ChildProcessCreationParams(String packageName, boolean isExternalService,
|
| - int libraryProcessType) {
|
| + int libraryProcessType, String[] additionalCommandLine) {
|
| mPackageName = packageName;
|
| mIsExternalService = isExternalService;
|
| mLibraryProcessType = libraryProcessType;
|
| + mAdditionalCommandLine =
|
| + (additionalCommandLine != null) ? additionalCommandLine.clone() : null;
|
| }
|
|
|
| public ChildProcessCreationParams copy() {
|
| - return new ChildProcessCreationParams(mPackageName, mIsExternalService,
|
| - mLibraryProcessType);
|
| + return new ChildProcessCreationParams(
|
| + mPackageName, mIsExternalService, mLibraryProcessType, mAdditionalCommandLine);
|
| }
|
|
|
| public String getPackageName() {
|
| @@ -55,12 +61,23 @@ public class ChildProcessCreationParams {
|
| return mLibraryProcessType;
|
| }
|
|
|
| + public String[] getAdditionalCommandLine() {
|
| + return (mAdditionalCommandLine != null) ? mAdditionalCommandLine.clone() : null;
|
| + }
|
| +
|
| public void addIntentExtras(Intent intent) {
|
| intent.putExtra(EXTRA_LIBRARY_PROCESS_TYPE, mLibraryProcessType);
|
| + if (mAdditionalCommandLine != null) {
|
| + intent.putExtra(EXTRA_ADDITIONAL_COMMAND_LINE, mAdditionalCommandLine);
|
| + }
|
| }
|
|
|
| public static int getLibraryProcessType(Intent intent) {
|
| return intent.getIntExtra(EXTRA_LIBRARY_PROCESS_TYPE,
|
| LibraryProcessType.PROCESS_CHILD);
|
| }
|
| +
|
| + public static String[] getAdditionalCommandLine(Intent intent) {
|
| + return intent.getStringArrayExtra(EXTRA_ADDITIONAL_COMMAND_LINE);
|
| + }
|
| }
|
|
|