Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(622)

Unified Diff: chrome/browser/ui/app_list/app_list_view_delegate.cc

Issue 992173002: Delete the old hotwording integration. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@hotword-remove-disable-option
Patch Set: Rebase. 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/search/hotword_service.cc ('k') | chrome/browser/ui/app_list/start_page_service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/app_list/app_list_view_delegate.cc
diff --git a/chrome/browser/ui/app_list/app_list_view_delegate.cc b/chrome/browser/ui/app_list/app_list_view_delegate.cc
index 3e9377e3bbac21ac1eb8e62b821119ec21868600..c16306c81056b41f224177bcc11eaa664097fa12 100644
--- a/chrome/browser/ui/app_list/app_list_view_delegate.cc
+++ b/chrome/browser/ui/app_list/app_list_view_delegate.cc
@@ -660,8 +660,7 @@ void AppListViewDelegate::ToggleSpeechRecognitionForHotword(
// should cause a search to happen for 'Ok Google', not two hotword triggers).
// To get around this, always stop the session when switching to speech
// recognition.
- if (HotwordService::IsExperimentalHotwordingEnabled() &&
- service && service->HotwordEnabled()) {
+ if (service && service->HotwordEnabled()) {
HotwordService* hotword_service =
HotwordServiceFactory::GetForProfile(profile_);
if (hotword_service)
@@ -699,7 +698,6 @@ void AppListViewDelegate::OnSpeechRecognitionStateChanged(
// speech recognition has stopped. Do not request hotwording after the app
// list has already closed.
if (new_state == app_list::SPEECH_RECOGNITION_READY &&
- HotwordService::IsExperimentalHotwordingEnabled() &&
service && service->HotwordEnabled() &&
controller_->GetAppListWindow()) {
HotwordService* hotword_service =
« no previous file with comments | « chrome/browser/search/hotword_service.cc ('k') | chrome/browser/ui/app_list/start_page_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698