chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellActivity.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: chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellActivity.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 | « chrome/android/javatests/src/org/chromium/chrome/browser/sync/ChromiumSyncAdapterTest.java ('k') | chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellApplication.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellActivity.java

diff --git a/chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellActivity.java b/chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellActivity.java

index 3de8cf72039234fedf6c280b705f1111d85d781f..6c9bef6712b7faaad374d97b8d25ecee4aba3d15 100644

--- a/chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellActivity.java

+++ b/chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellActivity.java

@@ -35,6 +35,7 @@

import org.chromium.chrome.browser.share.ShareHelper;

import org.chromium.chrome.shell.sync.SyncController;

import org.chromium.components.dom_distiller.core.DomDistillerUrlUtils;

+import org.chromium.content.app.ContentApplication;

import org.chromium.content.browser.ActivityContentVideoViewClient;

import org.chromium.content.browser.BrowserStartupController;

import org.chromium.content.browser.ContentViewCore;

@@ -102,7 +103,7 @@ public AppMenuHandler getAppMenuHandler(Activity activity,

protected void onCreate(final Bundle savedInstanceState) {

super.onCreate(savedInstanceState);

- ChromeShellApplication.initCommandLine();

+ ContentApplication.initCommandLine(this);

waitForDebuggerIfNeeded();

DeviceUtils.addDeviceSpecificUserAgentSwitch(this);