content/public/android/java/src/org/chromium/content/browser/accessibility/AccessibilityInjector.java - Issue 572013002: Removing ContentViewCore dependencies from direct WebContents functions.

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 572013002: Removing ContentViewCore dependencies from direct WebContents functions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebased the patch and addressed review comments. Created 6 years, 2 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 | « content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java ('k') | content/public/android/java/src/org/chromium/content/browser/accessibility/JellyBeanAccessibilityInjector.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 e5dec6e1229467c84685c349b294258c785871e2..78535b42a125cc60fd3995f4cc75bc1aba8b00b3 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

@@ -138,7 +138,7 @@ public class AccessibilityInjector extends WebContentsObserverAndroid {

if (mContentViewCore.isDeviceAccessibilityScriptInjectionEnabled() &&

js != null && mContentViewCore.isAlive()) {

addOrRemoveAccessibilityApisIfNecessary();

- mContentViewCore.evaluateJavaScript(js, null);

+ mContentViewCore.getWebContents().evaluateJavaScript(js, null);

mInjectedScriptEnabled = true;

mScriptInjected = true;

}

@@ -199,7 +199,7 @@ public class AccessibilityInjector extends WebContentsObserverAndroid {

if (mContentViewCore.isAlive()) {

String js = String.format(TOGGLE_CHROME_VOX_JAVASCRIPT, Boolean.toString(

mInjectedScriptEnabled));

- mContentViewCore.evaluateJavaScript(js, null);

+ mContentViewCore.getWebContents().evaluateJavaScript(js, null);

if (!mInjectedScriptEnabled) {

// Stop any TTS/Vibration right now.