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

Unified Diff: chrome/browser/resources/chromeos/select_to_speak/select_to_speak.js

Issue 2601333002: Update json_schema_compiler to handle the Automation extension API (Closed)
Patch Set: Rebase 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/select_to_speak/select_to_speak.js
diff --git a/chrome/browser/resources/chromeos/select_to_speak/select_to_speak.js b/chrome/browser/resources/chromeos/select_to_speak/select_to_speak.js
index 330f03f7eb7dfdb3a4b6f0d224ee750ca9957b77..fbc377bd5620b31fd6e4e00330e425e596ecc624 100644
--- a/chrome/browser/resources/chromeos/select_to_speak/select_to_speak.js
+++ b/chrome/browser/resources/chromeos/select_to_speak/select_to_speak.js
@@ -60,13 +60,13 @@ var SelectToSpeak = function() {
chrome.automation.getDesktop(function(desktop) {
desktop.addEventListener(
- EventType.mousePressed, this.onMousePressed_.bind(this), true);
+ EventType.MOUSE_PRESSED, this.onMousePressed_.bind(this), true);
desktop.addEventListener(
- EventType.mouseDragged, this.onMouseDragged_.bind(this), true);
+ EventType.MOUSE_DRAGGED, this.onMouseDragged_.bind(this), true);
desktop.addEventListener(
- EventType.mouseReleased, this.onMouseReleased_.bind(this), true);
+ EventType.MOUSE_RELEASED, this.onMouseReleased_.bind(this), true);
desktop.addEventListener(
- EventType.mouseCanceled, this.onMouseCanceled_.bind(this), true);
+ EventType.MOUSE_CANCELED, this.onMouseCanceled_.bind(this), true);
}.bind(this));
};
@@ -122,10 +122,10 @@ SelectToSpeak.prototype = {
// roles here.
var root = this.startNode_;
while (root.parent &&
- root.role != RoleType.window &&
- root.role != RoleType.rootWebArea &&
- root.role != RoleType.desktop &&
- root.role != RoleType.dialog) {
+ root.role != RoleType.WINDOW &&
+ root.role != RoleType.ROOT_WEB_AREA &&
+ root.role != RoleType.DESKTOP &&
+ root.role != RoleType.DIALOG) {
root = root.parent;
}
@@ -189,7 +189,7 @@ SelectToSpeak.prototype = {
for (var i = 0; i < nodes.length; i++) {
var node = nodes[i];
var isLast = (i == nodes.length - 1);
- chrome.tts.speak(node.name, {
+ chrome.tts.speak(node.name || '', {
lang: 'en-US',
'enqueue': true,
onEvent: (function(node, isLast, event) {

Powered by Google App Engine
This is Rietveld 408576698