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 fbc377bd5620b31fd6e4e00330e425e596ecc624..330f03f7eb7dfdb3a4b6f0d224ee750ca9957b77 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 @@ |
chrome.automation.getDesktop(function(desktop) { |
desktop.addEventListener( |
- EventType.MOUSE_PRESSED, this.onMousePressed_.bind(this), true); |
- desktop.addEventListener( |
- EventType.MOUSE_DRAGGED, this.onMouseDragged_.bind(this), true); |
- desktop.addEventListener( |
- EventType.MOUSE_RELEASED, this.onMouseReleased_.bind(this), true); |
- desktop.addEventListener( |
- EventType.MOUSE_CANCELED, this.onMouseCanceled_.bind(this), true); |
+ EventType.mousePressed, this.onMousePressed_.bind(this), true); |
+ desktop.addEventListener( |
+ EventType.mouseDragged, this.onMouseDragged_.bind(this), true); |
+ desktop.addEventListener( |
+ EventType.mouseReleased, this.onMouseReleased_.bind(this), true); |
+ desktop.addEventListener( |
+ EventType.mouseCanceled, this.onMouseCanceled_.bind(this), true); |
}.bind(this)); |
}; |
@@ -122,10 +122,10 @@ |
// roles here. |
var root = this.startNode_; |
while (root.parent && |
- root.role != RoleType.WINDOW && |
- root.role != RoleType.ROOT_WEB_AREA && |
- root.role != RoleType.DESKTOP && |
- root.role != RoleType.DIALOG) { |
+ root.role != RoleType.window && |
+ root.role != RoleType.rootWebArea && |
+ root.role != RoleType.desktop && |
+ root.role != RoleType.dialog) { |
root = root.parent; |
} |
@@ -189,7 +189,7 @@ |
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) { |