Hotword: Adds a field for always_on_available to the API StatusDetails

chrome/browser/resources/hotword/page_audio_manager.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.
 
 cr.define('hotword', function() {
   'use strict';
 
   /**
    * Class used to manage the interaction between hotwording and the
    * NTP/google.com. Injects a content script to interact with NTP/google.com
@@ skipping 436 matching lines @@
      * Sends the response to the tab.
      * @param {Tab} tab The tab that the request was sent from.
      * @param {function(HotwordStatus)} sendResponse Callback function to
      *     respond to sender.
      * @param {HotwordStatus} hotwordStatus Status of the hotword extension.
      * @private
      */
     statusDone_: function(tab, sendResponse, hotwordStatus) {
       var response = {'doNotShowOptinMessage': true};
 
+      // If always-on is available, then we do not show the promo, as the promo
+      // only works with the sometimes-on pref.
       if (!tab.incognito && hotwordStatus.available &&
-          !hotwordStatus.enabledSet) {
+          !hotwordStatus.enabledSet && !hotwordStatus.alwaysOnAvailable) {
         response = hotwordStatus;
       }
 
       try {
         sendResponse(response);
       } catch (err) {
         // Suppress the exception thrown by sendResponse() when the page doesn't
         // specify a response callback in the call to
         // chrome.runtime.sendMessage().
         // Unfortunately, there doesn't appear to be a way to detect one-way
@@ skipping 53 matching lines @@
         this.stopHotwording_();
         this.disconnectAllClients_();
       }
     }
   };
 
   return {
     PageAudioManager: PageAudioManager
   };
 });