Use new earcons in ChromeVox Next.

chrome/browser/resources/chromeos/chromevox/cvox2/background/background.js

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 /**
  * @fileoverview The entry point for all ChromeVox2 related code for the
  * background page.
  */
 
 goog.provide('Background');
 goog.provide('global');
 
 goog.require('AutomationPredicate');
 goog.require('AutomationUtil');
 goog.require('ClassicCompatibility');
+goog.require('NextEarcons');
 goog.require('Output');
 goog.require('Output.EventType');
 goog.require('cursors.Cursor');
 goog.require('cvox.BrailleKeyCommand');
 goog.require('cvox.ChromeVoxEditableTextBase');
+goog.require('cvox.ClassicEarcons');
 goog.require('cvox.ExtensionBridge');
 goog.require('cvox.NavBraille');
 
 goog.scope(function() {
 var AutomationNode = chrome.automation.AutomationNode;
 var Dir = AutomationUtil.Dir;
 var EventType = chrome.automation.EventType;
 var RoleType = chrome.automation.RoleType;
 
 /**
@@ skipping 77 matching lines @@
           var url = msg['url'];
           var isClassicEnabled = this.shouldEnableClassicForUrl_(url);
           port.postMessage({
             target: 'next',
             isClassicEnabled: isClassicEnabled
           });
         }
         break;
     }
   }.bind(this));
+
+  /** @type {!cvox.AbstractEarcons} @private */
+  this.classicEarcons_ = cvox.ChromeVox.earcons || new cvox.ClassicEarcons();

[Peter Lundblad, 2015/09/29 09:27:33]

This constructor now depends on only being called once. Should becauseensure
that somehow?

[dmazzoni, 2015/10/13 23:07:03]

I believe this isn't an issue anymore. If we constructed it twice it'd be no big
deal.

+
+  /** @type {!cvox.AbstractEarcons} @private */
+  this.nextEarcons_ = new NextEarcons();
+
+  cvox.ChromeVox.earcons = this.classicEarcons_;
 };
 
 Background.prototype = {
   /** Forces ChromeVox Next to be active for all tabs. */
   forceChromeVoxNextActive: function() {
     this.setChromeVoxMode(ChromeVoxMode.FORCE_NEXT);
   },
 
   /**
    * Handles all setup once a new automation tree appears.
@@ skipping 600 matching lines @@
       } else {
         // When in compat mode, if the focus is within the desktop tree proper,
         // then do not disable content scripts.
         if (this.currentRange_.start.node.root.role == 'desktop')
           return;
 
         this.disableClassicChromeVox_();
       }
     }.bind(this));
 
+    // Switch the earcon controller used depending on if we're using
+    // ChromeVox Next or Classic, but don't change it if the earcon
+    // controller is something else (like for testing).
+    if (cvox.ChromeVox.earcons == this.classicEarcons_ ||
+        cvox.ChromeVox.earcons == this.nextEarcons_) {
+      if (mode === ChromeVoxMode.FORCE_NEXT || mode === ChromeVoxMode.NEXT) {
+        cvox.ChromeVox.earcons = this.nextEarcons_;
+      } else {
+        cvox.ChromeVox.earcons = this.classicEarcons_;
+      }
+    }

[Peter Lundblad, 2015/09/29 09:27:33]

I am always cautious when introducing state that is not orthogonal
to other state. Could we make cvox.ChromeVox.earcons a getter that would return
the correct instance depending on mode. This way they wouldn't risk getting
out of sync if mode in the future gets modified somewhere else.

[dmazzoni, 2015/10/13 23:07:03]

Done, made it a getter.

+
     this.mode_ = mode;
   },
 
   /**
    * @param {!cvox.Spannable} text
    * @param {number} position
    * @private
    */
   brailleRoutingCommand_: function(text, position) {
     var actionNode = null;
@@ skipping 42 matching lines @@
               node.state.protected,
               cvox.ChromeVox.tts);
     }
   }
 };
 
 /** @type {Background} */
 global.backgroundObj = new Background();
 
 });  // goog.scope