chrome/browser/resources/hotword/launcher_manager.js - Issue 685053002: Treat regular and always-on hotwording settings as mutually exclusive.

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/launcher_manager.js

Issue 685053002: Treat regular and always-on hotwording settings as mutually exclusive. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 2 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

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

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

index 4ad07b6f4711d734a29b7a825b6c3f51df810267..59646ea5a9a1dad0cb3eb0f78153e5646ce4e64e 100644

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

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

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

/** @override */

enabled: function() {

- return this.stateManager.isEnabled() &&

- !this.stateManager.isAlwaysOnEnabled();

+ return this.stateManager.isSometimesOnEnabled();

/** @override */

« no previous file with comments | « no previous file | chrome/browser/resources/hotword/page_audio_manager.js » ('j') | no next file with comments »