chrome/android/java/src/org/chromium/chrome/browser/document/ChromeLauncherActivity.java - Issue 1364143002: Move ChromeCommandLineInitUtil to base/

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/java/src/org/chromium/chrome/browser/document/ChromeLauncherActivity.java

Issue 1364143002: Move ChromeCommandLineInitUtil to base/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@blimp_test

Patch Set: Created 5 years, 3 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

« blimp/client/android/java/src/org/chromium/blimp/BlimpApplication.java ('K') | « chrome/android/java/src/org/chromium/chrome/browser/ChromeCommandLineInitUtil.java ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/document/ChromeLauncherActivity.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/document/ChromeLauncherActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/document/ChromeLauncherActivity.java

index e9cef74686a8569ec4566db1467ae43e2a51fc3d..0154091d22b33dfcdf4e461aacdd6094cb3d7140 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/document/ChromeLauncherActivity.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/document/ChromeLauncherActivity.java

@@ -27,10 +27,10 @@ import android.text.TextUtils;

import org.chromium.base.ApiCompatibilityUtils;

import org.chromium.base.ApplicationStatus;

+import org.chromium.base.CommandLineInitUtil;

import org.chromium.base.Log;

import org.chromium.base.TraceEvent;

import org.chromium.chrome.browser.ChromeApplication;

-import org.chromium.chrome.browser.ChromeCommandLineInitUtil;

import org.chromium.chrome.browser.ChromeTabbedActivity;

import org.chromium.chrome.browser.IntentHandler;

import org.chromium.chrome.browser.IntentHandler.TabOpenType;

@@ -144,7 +144,7 @@ public class ChromeLauncherActivity extends Activity

// time at which the intent was received.

IntentHandler.addTimestampToIntent(getIntent());

// Initialize the command line in case we've disabled document mode from there.

- ChromeCommandLineInitUtil.initChromeCommandLine(this);

+ CommandLineInitUtil.initCommandLine(this, ChromeApplication.COMMAND_LINE_FILE);

// Read partner browser customizations information asynchronously.

// We want to initialize early because when there is no tabs to restore, we should possibly