Chromium Code Reviews| Index: chrome/browser/resources/chromeos/chromevox/cvox2/background/background.js |
| diff --git a/chrome/browser/resources/chromeos/chromevox/cvox2/background/background.js b/chrome/browser/resources/chromeos/chromevox/cvox2/background/background.js |
| index 8bdf42b41fa5b5a2eca2584157bf897dc1e2320b..903e3d299c61681d829da893b8e26173f150f533 100644 |
| --- a/chrome/browser/resources/chromeos/chromevox/cvox2/background/background.js |
| +++ b/chrome/browser/resources/chromeos/chromevox/cvox2/background/background.js |
| @@ -13,11 +13,13 @@ goog.provide('global'); |
| goog.require('AutomationPredicate'); |
| goog.require('AutomationUtil'); |
| goog.require('ClassicCompatibility'); |
| +goog.require('Cvox2EarconsBackground'); |
| goog.require('Output'); |
| goog.require('Output.EventType'); |
| goog.require('cursors.Cursor'); |
| goog.require('cvox.BrailleKeyCommand'); |
| goog.require('cvox.ChromeVoxEditableTextBase'); |
| +goog.require('cvox.EarconsBackground'); |
| goog.require('cvox.ExtensionBridge'); |
| goog.require('cvox.NavBraille'); |
| @@ -116,6 +118,12 @@ Background = function() { |
| break; |
| } |
| }.bind(this)); |
| + |
| + /** @type {!cvox.AbstractEarcons} @private */ |
| + this.classicEarcons_ = new cvox.EarconsBackground(); |
| + |
| + /** @type {!cvox.AbstractEarcons} @private */ |
| + this.nextEarcons_ = new Cvox2EarconsBackground(); |
| }; |
| Background.prototype = { |
| @@ -708,6 +716,12 @@ Background.prototype = { |
| } |
| }.bind(this)); |
| + if (mode === ChromeVoxMode.FORCE_NEXT || mode === ChromeVoxMode.NEXT) { |
|
Peter Lundblad
2015/09/07 21:15:52
I think this means that classic could play cvox2 e
dmazzoni
2015/09/07 23:43:04
My intent here is that you get classic earcons in
|
| + cvox.ChromeVox.earcons = this.nextEarcons_; |
| + } else { |
| + cvox.ChromeVox.earcons = this.classicEarcons_; |
| + } |
| + |
| this.mode_ = mode; |
| }, |