content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java - Issue 615153002: Enable content layer to initCommandLine on Android

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/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java

Issue 615153002: Enable content layer to initCommandLine on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: ChromiumSyncAdapterTest#testRequestSyncWhenChromeInBackground now asserts true for CommandLine.isIn… Created 6 years, 2 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 | « content/public/android/javatests/src/org/chromium/content/browser/ContentCommandLineTest.java ('k') | content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellApplication.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java

diff --git a/content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java b/content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java

index 1acea2070cce47fa8668700bc9544230d5a64730..68d90b9c3a0f492b7f563229a28682b3fa66cefb 100644

--- a/content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java

+++ b/content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java

@@ -17,6 +17,7 @@

import org.chromium.base.MemoryPressureListener;

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;

import org.chromium.content.browser.ContentViewCore;

import org.chromium.content.browser.DeviceUtils;

@@ -31,7 +32,6 @@

public class ContentShellActivity extends Activity {

- public static final String COMMAND_LINE_FILE = "/data/local/tmp/content-shell-command-line";

private static final String TAG = "ContentShellActivity";

private static final String ACTIVE_SHELL_URL_KEY = "activeUrl";

@@ -46,7 +46,7 @@ protected void onCreate(final Bundle savedInstanceState) {

// Initializing the command line must occur before loading the library.

if (!CommandLine.isInitialized()) {

- CommandLine.initFromFile(COMMAND_LINE_FILE);

+ ContentApplication.initCommandLine(this);

String[] commandLineParams = getCommandLineParamsFromIntent(getIntent());

if (commandLineParams != null) {

CommandLine.getInstance().appendSwitchesAndArguments(commandLineParams);