Modifies handling of hotword NaCl module.

chrome/browser/resources/app_list/speech_manager.js

 // Copyright 2013 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 class to Manage both offline / online speech recognition.
  */
 
 <include src="plugin_manager.js"/>
 <include src="audio_manager.js"/>
 <include src="speech_recognition_manager.js"/>
 
 cr.define('speech', function() {
   'use strict';
 
   /**
    * The state of speech recognition.
    *
    * @enum {string}
    */
   var SpeechState = {
     READY: 'READY',
     HOTWORD_RECOGNIZING: 'HOTWORD_RECOGNIZING',
     RECOGNIZING: 'RECOGNIZING',
     IN_SPEECH: 'IN_SPEECH',
     STOPPING: 'STOPPING'
   };
 
   /**
+   * Checks the prefix for the hotword module based on the language. This is
+   * fragile if the file structure has changed.
+   */
+  function getHotwordPrefix() {
+    var prefix = navigator.language.toLowerCase();
+    if (prefix == 'en-gb')
+      return prefix;
+    var hyphen = prefix.indexOf('-');
+    if (hyphen >= 0)
+      prefix = prefix.substr(0, hyphen);
+    if (prefix == 'en')
+      prefix = '';
+    return prefix;
+  }
+
+  /**
    * @constructor
    */
   function SpeechManager() {
     this.audioManager_ = new speech.AudioManager();
     this.audioManager_.addEventListener('audio', this.onAudioLevel_.bind(this));
     this.speechRecognitionManager_ = new speech.SpeechRecognitionManager(this);
   }
 
   /**
    * Updates the state.
@@ skipping 31 matching lines @@
    *   ready.
    * @private
    */
   SpeechManager.prototype.onHotwordRecognizerReady_ = function(pluginManager) {
     this.pluginManager_ = pluginManager;
     this.audioManager_.addEventListener(
         'audio', pluginManager.sendAudioData.bind(pluginManager));
     this.pluginManager_.startRecognizer();
     this.audioManager_.start();
     this.setState_(SpeechState.HOTWORD_RECOGNIZING);
-    chrome.send('setHotwordRecognizerState', [true]);
   };
 
   /**
    * Called when the hotword is recognized.
    *
    * @private
    */
   SpeechManager.prototype.onHotwordRecognized_ = function() {
     if (this.state != SpeechState.HOTWORD_RECOGNIZING)
       return;
@@ skipping 64 matching lines @@
   /**
    * Changes the availability of the hotword plugin.
    *
    * @param {boolean} enabled Whether enabled or not.
    */
   SpeechManager.prototype.setHotwordEnabled = function(enabled) {
     var recognizer = $('recognizer');
     if (enabled) {
       if (recognizer)
         return;
+      if (!this.naclArch)
+        return;
+
+      var prefix = getHotwordPrefix();
       var pluginManager = new speech.PluginManager(
+          prefix,
           this.onHotwordRecognizerReady_.bind(this),
           this.onHotwordRecognized_.bind(this));
-      pluginManager.scheduleInitialize(
-          this.audioManager_.sampleRate, 'chrome://app-list/hotword.data');
+      var modelUrl = 'chrome://app-list/_platform_specific/' + this.naclArch +
+          '_' + prefix + '/hotword.data';
+      pluginManager.scheduleInitialize(this.audioManager_.sampleRate, modelUrl);
     } else {
       if (!recognizer)
         return;
       document.body.removeChild(recognizer);
       this.pluginManager_ = null;
       if (this.state == SpeechState.HOTWORD_RECOGNIZING) {
         this.audioManager_.stop();
         this.setState_(SpeechState.READY);
       }
     }
   };
 
   /**
+   * Sets the NaCl architecture for the hotword module.
+   *
+   * @param {string} arch The architecture.
+   */
+  SpeechManager.prototype.setNaclArch = function(arch) {
+    this.naclArch = arch;
+  };
+
+  /**
    * Called when the app-list bubble is shown.
    *
    * @param {boolean} hotwordEnabled Whether the hotword is enabled or not.
    */
   SpeechManager.prototype.onShown = function(hotwordEnabled) {
     this.setHotwordEnabled(hotwordEnabled);
 
     // No one sets the state if the content is initialized on shown but hotword
     // is not enabled. Sets the state in such case.
     if (!this.state && !hotwordEnabled)
@@ skipping 31 matching lines @@
       if (this.audioManager_.state == speech.AudioState.STOPPED)
         this.audioManager_.start();
       this.speechRecognitionManager_.start();
     }
   };
 
   return {
     SpeechManager: SpeechManager
   };
 });