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

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/ChromeCommandLineInitUtil.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
Index: chrome/android/java/src/org/chromium/chrome/browser/ChromeCommandLineInitUtil.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeCommandLineInitUtil.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeCommandLineInitUtil.java
deleted file mode 100644
index e574da46cc8f380af6d0cdd4bd82d639d3dfb2e3..0000000000000000000000000000000000000000
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeCommandLineInitUtil.java
+++ /dev/null
@@ -1,100 +0,0 @@
-// Copyright 2015 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package org.chromium.chrome.browser;
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.os.Build;
-import android.provider.Settings;
-import android.util.Log;
-
-import org.chromium.base.CommandLine;
-
-import java.io.File;
-
-/**
- * Provides implementation of command line initialization for Chrome for Android.
- */
-public final class ChromeCommandLineInitUtil {
-
- private static final String TAG = "ChromeCommandLineInitUtil";
-
- /**
- * The location of the command line file needs to be in a protected
- * directory so requires root access to be tweaked, i.e., no other app in a
- * regular (non-rooted) device can change this file's contents.
- * See below for debugging on a regular (non-rooted) device.
- */
- private static final String COMMAND_LINE_FILE_PATH = "/data/local";
-
- /**
- * This path (writable by the shell in regular non-rooted "user" builds) is used when:
- * 1) The "debug app" is set to chrome
- * and
- * 2) ADB is enabled.
- *
- */
- private static final String COMMAND_LINE_FILE_PATH_DEBUG_APP = "/data/local/tmp";
- private static final String COMMAND_LINE_FILE = "chrome-command-line";
-
- private ChromeCommandLineInitUtil() {
- }
-
- public static void initChromeCommandLine(Context context) {
- if (!CommandLine.isInitialized()) {
- File commandLineFile = getAlternativeCommandLinePath(context);
- if (commandLineFile == null) {
- commandLineFile = new File(COMMAND_LINE_FILE_PATH, COMMAND_LINE_FILE);
- }
- CommandLine.initFromFile(commandLineFile.getPath());
- }
- }
-
- /**
- * Use an alternative path if adb is enabled and the debug app is chrome.
- */
- private static File getAlternativeCommandLinePath(Context context) {
- File alternativeCommandLineFile =
- new File(COMMAND_LINE_FILE_PATH_DEBUG_APP, COMMAND_LINE_FILE);
- if (!alternativeCommandLineFile.exists()) return null;
- try {
- String debugApp = Build.VERSION.SDK_INT < 17
- ? getDebugAppPreJBMR1(context) : getDebugAppJBMR1(context);
-
- if (debugApp != null
- && debugApp.equals(context.getApplicationContext().getPackageName())) {
- Log.i(TAG, "Using alternative command line file in "
- + alternativeCommandLineFile.getPath());
- return alternativeCommandLineFile;
- }
- } catch (RuntimeException e) {
- Log.e(TAG, "Unable to detect alternative command line file");
- }
-
- return null;
- }
-
- @SuppressLint("NewApi")
- private static String getDebugAppJBMR1(Context context) {
- boolean adbEnabled = Settings.Global.getInt(context.getContentResolver(),
- Settings.Global.ADB_ENABLED, 0) == 1;
- if (adbEnabled) {
- return Settings.Global.getString(context.getContentResolver(),
- Settings.Global.DEBUG_APP);
- }
- return null;
- }
-
- @SuppressWarnings("deprecation")
- private static String getDebugAppPreJBMR1(Context context) {
- boolean adbEnabled = Settings.System.getInt(context.getContentResolver(),
- Settings.System.ADB_ENABLED, 0) == 1;
- if (adbEnabled) {
- return Settings.System.getString(context.getContentResolver(),
- Settings.System.DEBUG_APP);
- }
- return null;
- }
-}

Powered by Google App Engine
This is Rietveld 408576698