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

Unified Diff: chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellApplication.java

Issue 1001973002: Revert of Upstream ChromeMobileApplication bits about sync browser initialization (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 9 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/java/strings/android_chrome_strings.grd ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellApplication.java
diff --git a/chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellApplication.java b/chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellApplication.java
index 64e40fee50bb40f4b476f225ee0921c5fe0ea699..c99e84e968cfb1f55c90d9de0ac29d7b0c9f4f03 100644
--- a/chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellApplication.java
+++ b/chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellApplication.java
@@ -6,6 +6,7 @@ package org.chromium.chrome.shell;
import android.content.Intent;
+import org.chromium.base.CommandLine;
import org.chromium.base.PathUtils;
import org.chromium.base.ResourceExtractor;
import org.chromium.chrome.browser.ChromiumApplication;
@@ -96,6 +97,13 @@ public class ChromeShellApplication extends ChromiumApplication {
}
@Override
+ public void initCommandLine() {
+ if (!CommandLine.isInitialized()) {
+ CommandLine.initFromFile(COMMAND_LINE_FILE);
+ }
+ }
+
+ @Override
public String getSettingsActivityName() {
return ChromeShellPreferences.class.getName();
}
« no previous file with comments | « chrome/android/java/strings/android_chrome_strings.grd ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698