Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(252)

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/init/AsyncInitializationActivity.java

Issue 2017963003: Upstream: ChildProcessLauncher connects renderer processes of WebAPKs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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
Index: chrome/android/java/src/org/chromium/chrome/browser/init/AsyncInitializationActivity.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/AsyncInitializationActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/init/AsyncInitializationActivity.java
index 5887eba84ce825c158613288b10d58f446e3e59d..5a954c34b7e8832098889972982151476b6fd333 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/init/AsyncInitializationActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/init/AsyncInitializationActivity.java
@@ -23,6 +23,7 @@ import android.view.ViewTreeObserver.OnPreDrawListener;
import android.view.WindowManager;
import org.chromium.base.ApiCompatibilityUtils;
+import org.chromium.base.ContextUtils;
import org.chromium.base.TraceEvent;
import org.chromium.base.library_loader.LoaderErrors;
import org.chromium.base.library_loader.ProcessInitException;
@@ -33,6 +34,7 @@ import org.chromium.chrome.browser.metrics.MemoryUma;
import org.chromium.chrome.browser.profiles.Profile;
import org.chromium.chrome.browser.tabmodel.DocumentModeAssassin;
import org.chromium.chrome.browser.upgrade.UpgradeActivity;
+import org.chromium.content.browser.ChildProcessCreationParams;
import org.chromium.ui.base.DeviceFormFactor;
import java.lang.reflect.Field;
@@ -108,9 +110,18 @@ public abstract class AsyncInitializationActivity extends AppCompatActivity impl
// Kick off long running IO tasks that can be done in parallel.
mNativeInitializationController = new NativeInitializationController(this, this);
+ initializeChildProcessCreationParams();
mNativeInitializationController.startBackgroundTasks();
}
+ /**
+ * Allow derived classes to initialize their own {@link ChildProcessCreationParams}.
+ */
+ protected void initializeChildProcessCreationParams() {
+ ChromeApplication chrome = (ChromeApplication) ContextUtils.getApplicationContext();
+ ChildProcessCreationParams.set(chrome.getChildProcessCreationParams());
+ }
+
@Override
public void postInflationStartup() {
final View firstDrawView = getViewToBeDrawnBeforeInitializingNative();

Powered by Google App Engine
This is Rietveld 408576698