chrome/browser/resources/hotword/page_audio_manager.js - Issue 1011913005: Hotword: Adds a field for always_on_available to the API StatusDetails

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/resources/hotword/page_audio_manager.js

Issue 1011913005: Hotword: Adds a field for always_on_available to the API StatusDetails (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Adress merge conflicts Created 5 years, 9 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

« no previous file with comments | « chrome/browser/extensions/api/hotword_private/hotword_private_api.cc ('k') | chrome/common/extensions/api/hotword_private.idl » ('j') | chrome/common/extensions/api/hotword_private.idl » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/resources/hotword/page_audio_manager.js

diff --git a/chrome/browser/resources/hotword/page_audio_manager.js b/chrome/browser/resources/hotword/page_audio_manager.js

index 8a67cdaba7be6ed7213ac94c6f9daf7cb670b769..eb079a966a323f52ee80f733511141632ee590e7 100644

--- a/chrome/browser/resources/hotword/page_audio_manager.js

+++ b/chrome/browser/resources/hotword/page_audio_manager.js

@@ -455,7 +455,7 @@ cr.define('hotword', function() {

var response = {'doNotShowOptinMessage': true};

if (!tab.incognito && hotwordStatus.available &&

- !hotwordStatus.enabledSet) {

+ !hotwordStatus.enabledSet && !hotwordStatus.alwaysOnAvailable) {

benwells 2015/03/17 03:02:55 Why is this !available? My reading of this is that

kcarattini 2015/03/17 04:22:17 That's correct. This promo is for the 'sometimes-o

response = hotwordStatus;

}