content/public/android/java/src/org/chromium/content/browser/accessibility/AccessibilityInjector.java - Issue 62333025: [Android] Move CommandLine.java 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: content/public/android/java/src/org/chromium/content/browser/accessibility/AccessibilityInjector.java

Issue 62333025: [Android] Move CommandLine.java to base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase Created 7 years, 1 month 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

« base/base.gypi ('K') | « content/public/android/java/src/org/chromium/content/browser/HeapStatsLogger.java ('k') | content/public/android/java/src/org/chromium/content/common/CommandLine.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/public/android/java/src/org/chromium/content/browser/accessibility/AccessibilityInjector.java

diff --git a/content/public/android/java/src/org/chromium/content/browser/accessibility/AccessibilityInjector.java b/content/public/android/java/src/org/chromium/content/browser/accessibility/AccessibilityInjector.java

index 4209741e943739e3e88418f2df6e7b23b7bc8157..b54200991445c4cc1bb6cc6bcb5585aeebb3a259 100644

--- a/content/public/android/java/src/org/chromium/content/browser/accessibility/AccessibilityInjector.java

+++ b/content/public/android/java/src/org/chromium/content/browser/accessibility/AccessibilityInjector.java

@@ -22,10 +22,11 @@ import com.googlecode.eyesfree.braille.selfbraille.WriteData;

import org.apache.http.NameValuePair;

import org.apache.http.client.utils.URLEncodedUtils;

+import org.chromium.base.CommandLine;

import org.chromium.content.browser.ContentViewCore;

import org.chromium.content.browser.JavascriptInterface;

import org.chromium.content.browser.WebContentsObserverAndroid;

-import org.chromium.content.common.CommandLine;

+import org.chromium.content.common.ContentSwitches;

import org.json.JSONException;

import org.json.JSONObject;

@@ -112,7 +113,8 @@ public class AccessibilityInjector extends WebContentsObserverAndroid {

mContentViewCore = view;

mAccessibilityScreenReaderUrl = CommandLine.getInstance().getSwitchValue(

- CommandLine.ACCESSIBILITY_JAVASCRIPT_URL, DEFAULT_ACCESSIBILITY_SCREEN_READER_URL);

+ ContentSwitches.ACCESSIBILITY_JAVASCRIPT_URL,

+ DEFAULT_ACCESSIBILITY_SCREEN_READER_URL);

mHasVibratePermission = mContentViewCore.getContext().checkCallingOrSelfPermission(

android.Manifest.permission.VIBRATE) == PackageManager.PERMISSION_GRANTED;

@@ -397,7 +399,7 @@ public class AccessibilityInjector extends WebContentsObserverAndroid {

mView = view;

mTextToSpeech = new TextToSpeech(context, null, null);

mSelfBrailleClient = new SelfBrailleClient(context, CommandLine.getInstance().hasSwitch(

- CommandLine.ACCESSIBILITY_DEBUG_BRAILLE_SERVICE));

+ ContentSwitches.ACCESSIBILITY_DEBUG_BRAILLE_SERVICE));

}

@JavascriptInterface