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

Unified Diff: chrome/browser/resources/chromeos/chromevox/chromevox/injected/navigation_manager.js

Issue 1306773003: Make earcon ids strings instead of numbers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@remove_unused_earcons
Patch Set: Fixed test Created 5 years, 4 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/chromevox/injected/navigation_manager.js
diff --git a/chrome/browser/resources/chromeos/chromevox/chromevox/injected/navigation_manager.js b/chrome/browser/resources/chromeos/chromevox/chromevox/injected/navigation_manager.js
index 6dc66039f69254c3e4d1481792f1be972effd29e..00b37281b1ee58274dc15aaf9ac3923d1d78bf89 100644
--- a/chrome/browser/resources/chromeos/chromevox/chromevox/injected/navigation_manager.js
+++ b/chrome/browser/resources/chromeos/chromevox/chromevox/injected/navigation_manager.js
@@ -111,7 +111,7 @@ cvox.NavigationManager.prototype.reset = function() {
* @private
*/
this.curSel_ = document.activeElement != document.body ?
- /** @type {!cvox.CursorSelection} **/
+ /** @type {!cvox.CursorSelection} */
(cvox.CursorSelection.fromNode(document.activeElement)) :
this.shifter_.begin(this.curSel_, {reversed: false});
@@ -449,23 +449,23 @@ cvox.NavigationManager.prototype.getDescription = function() {
// Earcons.
if (this.skipped_) {
- earcons.push(cvox.AbstractEarcons.PARAGRAPH_BREAK);
+ earcons.push(cvox.Earcon.PARAGRAPH_BREAK);
this.skipped_ = false;
}
if (this.recovered_) {
- earcons.push(cvox.AbstractEarcons.FONT_CHANGE);
+ earcons.push(cvox.Earcon.FONT_CHANGE);
this.recovered_ = false;
}
if (this.pageEnd_) {
- earcons.push(cvox.AbstractEarcons.WRAP);
+ earcons.push(cvox.Earcon.WRAP);
this.pageEnd_ = false;
}
if (this.enteredShifter_) {
- earcons.push(cvox.AbstractEarcons.OBJECT_ENTER);
+ earcons.push(cvox.Earcon.OBJECT_ENTER);
this.enteredShifter_ = false;
}
if (this.exitedShifter_) {
- earcons.push(cvox.AbstractEarcons.OBJECT_EXIT);
+ earcons.push(cvox.Earcon.OBJECT_EXIT);
this.exitedShifter_ = false;
}
if (earcons.length > 0 && desc.length > 0) {
@@ -701,7 +701,7 @@ cvox.NavigationManager.prototype.finishNavCommand = function(
if (this.pageEnd_ && !this.pageEndAnnounced_) {
this.pageEndAnnounced_ = true;
cvox.ChromeVox.tts.stop();
- cvox.ChromeVox.earcons.playEarcon(cvox.AbstractEarcons.WRAP);
+ cvox.ChromeVox.earcons.playEarcon(cvox.Earcon.WRAP);
if (cvox.ChromeVox.verbosity === cvox.VERBOSITY_VERBOSE) {
var msg = cvox.ChromeVox.msgs.getMsg('wrapped_to_top');
if (this.isReversed()) {

Powered by Google App Engine
This is Rietveld 408576698