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

Unified Diff: content/public/android/java/org/chromium/content/common/CommandLine.java

Issue 10532155: Upstream some more content/ DEPS-related cleanup. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: remove JNIHelper/BitmapHolder Created 8 years, 6 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: content/public/android/java/org/chromium/content/common/CommandLine.java
diff --git a/content/public/android/java/org/chromium/content/browser/CommandLine.java b/content/public/android/java/org/chromium/content/common/CommandLine.java
similarity index 99%
rename from content/public/android/java/org/chromium/content/browser/CommandLine.java
rename to content/public/android/java/org/chromium/content/common/CommandLine.java
index ae10a7a36e19efcd6eb6fdcdc3bfbdcf5e5b8b08..805d2c4c0b0060a55a692c419423f59dbe20f133 100644
--- a/content/public/android/java/org/chromium/content/browser/CommandLine.java
+++ b/content/public/android/java/org/chromium/content/common/CommandLine.java
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-package org.chromium.content.browser;
+package org.chromium.content.common;
import android.util.Log;
@@ -191,14 +191,14 @@ public abstract class CommandLine {
private static final String SWITCH_TERMINATOR = SWITCH_PREFIX;
private static final String SWITCH_VALUE_SEPARATOR = "=";
- static void enableNativeProxy() {
+ public static void enableNativeProxy() {
// Make a best-effort to ensure we make a clean (atomic) switch over from the old to
// the new command line implementation. If another thread is modifying the command line
// when this happens, all bets are off. (As per the native CommandLine).
sCommandLine.set(new NativeCommandLine());
}
- static String[] getJavaSwitchesOrNull() {
+ public static String[] getJavaSwitchesOrNull() {
CommandLine commandLine = sCommandLine.get();
if (commandLine != null) {
assert !commandLine.isNativeImplementation();

Powered by Google App Engine
This is Rietveld 408576698