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

Unified Diff: chrome/browser/resources/chromeos/chromevox/cvox2/background/command_handler.js

Issue 2650733002: Revert of Update json_schema_compiler to handle the Automation extension API (Closed)
Patch Set: Created 3 years, 11 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/browser/resources/chromeos/chromevox/cvox2/background/command_handler.js
diff --git a/chrome/browser/resources/chromeos/chromevox/cvox2/background/command_handler.js b/chrome/browser/resources/chromeos/chromevox/cvox2/background/command_handler.js
index e483f40de44b8eb657e834ab9f28c9904ab2851c..9f70869aa418c9a578c65ffd9e8add53461ed4f0 100644
--- a/chrome/browser/resources/chromeos/chromevox/cvox2/background/command_handler.js
+++ b/chrome/browser/resources/chromeos/chromevox/cvox2/background/command_handler.js
@@ -42,8 +42,8 @@
case 'speakTimeAndDate':
chrome.automation.getDesktop(function(d) {
// First, try speaking the on-screen time.
- var allTime = d.findAll({role: RoleType.TIME});
- allTime.filter(function(t) { return t.root.role == RoleType.DESKTOP; });
+ var allTime = d.findAll({role: RoleType.time});
+ allTime.filter(function(t) { return t.root.role == RoleType.desktop; });
var timeString = '';
allTime.forEach(function(t) {
@@ -445,7 +445,7 @@
case 'forceClickOnCurrentItem':
if (ChromeVoxState.instance.currentRange_) {
var actionNode = ChromeVoxState.instance.currentRange_.start.node;
- if (actionNode.role == RoleType.INLINE_TEXT_BOX)
+ if (actionNode.role == RoleType.inlineTextBox)
actionNode = actionNode.parent;
actionNode.doDefault();
}
@@ -466,8 +466,8 @@
// Stop if we've wrapped back to the document.
var maybeDoc = newRange.start.node;
- if (maybeDoc.role == RoleType.ROOT_WEB_AREA &&
- maybeDoc.parent.root.role == RoleType.DESKTOP) {
+ if (maybeDoc.role == RoleType.rootWebArea &&
+ maybeDoc.parent.root.role == RoleType.desktop) {
ChromeVoxState.isReadingContinuously = false;
return;
}
@@ -493,7 +493,7 @@
case 'contextMenu':
if (ChromeVoxState.instance.currentRange_) {
var actionNode = ChromeVoxState.instance.currentRange_.start.node;
- if (actionNode.role == RoleType.INLINE_TEXT_BOX)
+ if (actionNode.role == RoleType.inlineTextBox)
actionNode = actionNode.parent;
actionNode.showContextMenu();
return false;
@@ -524,13 +524,13 @@
var target = ChromeVoxState.instance.currentRange_.start.node;
var output = new Output();
- if (target.root.role == RoleType.ROOT_WEB_AREA) {
+ if (target.root.role == RoleType.rootWebArea) {
// Web.
target = target.root;
output.withString(target.name || target.docUrl);
} else {
// Views.
- while (target.role != RoleType.WINDOW) target = target.parent;
+ while (target.role != RoleType.window) target = target.parent;
if (target)
output.withString(target.name || '');
}
@@ -615,7 +615,7 @@
case 'goToRowFirstCell':
case 'goToRowLastCell':
var node = current.start.node;
- while (node && node.role != RoleType.ROW)
+ while (node && node.role != RoleType.row)
node = node.parent;
if (!node)
break;
@@ -628,7 +628,7 @@
case 'goToColFirstCell':
dir = Dir.FORWARD;
var node = current.start.node;
- while (node && node.role != RoleType.TABLE)
+ while (node && node.role != RoleType.table)
node = node.parent;
if (!node || !node.firstChild)
return false;
@@ -643,7 +643,7 @@
case 'goToColLastCell':
dir = Dir.BACKWARD;
var node = current.start.node;
- while (node && node.role != RoleType.TABLE)
+ while (node && node.role != RoleType.table)
node = node.parent;
if (!node || !node.lastChild)
return false;
@@ -658,7 +658,7 @@
case 'goToFirstCell':
case 'goToLastCell':
node = current.start.node;
- while (node && node.role != RoleType.TABLE)
+ while (node && node.role != RoleType.table)
node = node.parent;
if (!node)
break;

Powered by Google App Engine
This is Rietveld 408576698