chrome/browser/ui/app_list/start_page_service.cc - 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/ui/app_list/start_page_service.cc

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/ui/app_list/start_page_service.cc

diff --git a/chrome/browser/ui/app_list/start_page_service.cc b/chrome/browser/ui/app_list/start_page_service.cc

index b8af9bd5f3656fb6fab272a425c34731fd487bda..3bf52716cae76ce23a0fb9bb3b43a12a1d3d475b 100644

--- a/chrome/browser/ui/app_list/start_page_service.cc

+++ b/chrome/browser/ui/app_list/start_page_service.cc

@@ -174,8 +174,10 @@ void StartPageService::ToggleSpeechRecognition() {

bool StartPageService::HotwordEnabled() {

if (HotwordService::IsExperimentalHotwordingEnabled()) {

+ auto prefs = profile_->GetPrefs();

return HotwordServiceFactory::IsServiceAvailable(profile_) &&

- profile_->GetPrefs()->GetBoolean(prefs::kHotwordSearchEnabled);

+ (prefs->GetBoolean(prefs::kHotwordSearchEnabled) ||

+ prefs->GetBoolean(prefs::kHotwordAlwaysOnSearchEnabled));

}

#if defined(OS_CHROMEOS)

return HotwordServiceFactory::IsServiceAvailable(profile_) &&

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