components/gcm_driver/android/java/src/org/chromium/components/gcm_driver/GCMDriver.java - Issue 897683003: Know the process shared library loaded in

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: components/gcm_driver/android/java/src/org/chromium/components/gcm_driver/GCMDriver.java

Issue 897683003: Know the process shared library loaded in (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix webview compile error Created 5 years, 11 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/ChromeBrowserStartupController.java ('K') | « components/devtools_bridge/android/javatests/src/org/chromium/components/devtools_bridge/tests/TestApplication.java ('k') | content/public/android/java/src/org/chromium/content/app/ChildProcessService.java » ('j') | content/public/android/java/src/org/chromium/content/app/ChildProcessService.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/gcm_driver/android/java/src/org/chromium/components/gcm_driver/GCMDriver.java

diff --git a/components/gcm_driver/android/java/src/org/chromium/components/gcm_driver/GCMDriver.java b/components/gcm_driver/android/java/src/org/chromium/components/gcm_driver/GCMDriver.java

index c40d8d6729de18a2c82e86b96d4e78c7a544ef0a..b57903fba1987df406736da9d1305dd0456e79f2 100644

--- a/components/gcm_driver/android/java/src/org/chromium/components/gcm_driver/GCMDriver.java

+++ b/components/gcm_driver/android/java/src/org/chromium/components/gcm_driver/GCMDriver.java

@@ -14,6 +14,7 @@ import android.util.Log;

import org.chromium.base.CalledByNative;

import org.chromium.base.JNINamespace;

import org.chromium.base.ThreadUtils;

+import org.chromium.base.library_loader.LibraryLoader;

import org.chromium.base.library_loader.ProcessInitException;

import org.chromium.content.app.ContentApplication;

import org.chromium.content.browser.BrowserStartupController;

@@ -138,8 +139,8 @@ public class GCMDriver {

List<String> dataKeysAndValues = new ArrayList<String>();

for (String key : extras.keySet()) {

// TODO(johnme): Check there aren't other keys that we need to exclude.

- if (key.equals(bundleSubtype) || key.equals(bundleSenderId) ||

- key.equals(bundleCollapseKey) || key.startsWith(bundleGcmplex))

+ if (key.equals(bundleSubtype) || key.equals(bundleSenderId)

+ || key.equals(bundleCollapseKey) || key.startsWith(bundleGcmplex))

continue;

dataKeysAndValues.add(key);

dataKeysAndValues.add(extras.getString(key));

@@ -198,7 +199,8 @@ public class GCMDriver {

ContentApplication.initCommandLine(context);

try {

- BrowserStartupController.get(context).startBrowserProcessesSync(false);

+ BrowserStartupController.get(context, LibraryLoader.BROWSER)

+ .startBrowserProcessesSync(false);

if (sInstance != null) {

task.run();

} else {