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

Unified Diff: chrome/browser/extensions/api/hotword_private/hotword_private_api.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
Index: chrome/browser/extensions/api/hotword_private/hotword_private_api.cc
diff --git a/chrome/browser/extensions/api/hotword_private/hotword_private_api.cc b/chrome/browser/extensions/api/hotword_private/hotword_private_api.cc
index 2c37752ce7d2036b53845b96d79468f53fd9dfff..9898912b411bcd461567515c760745bb64195279 100644
--- a/chrome/browser/extensions/api/hotword_private/hotword_private_api.cc
+++ b/chrome/browser/extensions/api/hotword_private/hotword_private_api.cc
@@ -166,8 +166,8 @@ bool HotwordPrivateGetStatusFunction::RunSync() {
PrefService* prefs = GetProfile()->GetPrefs();
result.enabled_set = prefs->HasPrefPath(prefs::kHotwordSearchEnabled);
- result.experimental_hotword_enabled =
- HotwordService::IsExperimentalHotwordingEnabled();
+ // TODO(amistry): Remove this. Nothing uses it.
+ result.experimental_hotword_enabled = true;
SetResult(result.ToValue().release());
return true;
@@ -210,8 +210,7 @@ bool HotwordPrivateNotifyHotwordRecognitionFunction::RunSync() {
hotword_service->NotifyHotwordTriggered();
} else if (hotword_service->client()) {
hotword_service->client()->OnHotwordRecognized(preamble);
- } else if (HotwordService::IsExperimentalHotwordingEnabled() &&
- hotword_service->IsAlwaysOnEnabled()) {
+ } else if (hotword_service->IsAlwaysOnEnabled()) {
Browser* browser = GetCurrentBrowser();
// If a Browser does not exist, fall back to the universally available,
// but not recommended, way.

Powered by Google App Engine
This is Rietveld 408576698