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

Unified Diff: chrome/browser/ui/webui/options/browser_options_handler.cc

Issue 1008303002: Only disable hotwording if the VoiceTrigger field trial is set to 'Disabled'. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Change some EXPECTs to ASSERTs. 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_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/options/browser_options_handler.cc
diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc
index 2ce680435fbf7aca2e7874abe1d0db6ab6bed847..549bdaa175f3acdbea6cf1e034fc60fff5e73fad 100644
--- a/chrome/browser/ui/webui/options/browser_options_handler.cc
+++ b/chrome/browser/ui/webui/options/browser_options_handler.cc
@@ -1781,9 +1781,9 @@ void BrowserOptionsHandler::HandleRequestHotwordAvailable(
return;
}
- std::string group = base::FieldTrialList::FindFullName("VoiceTrigger");
- if (!group.empty() && group != "Disabled" &&
- HotwordServiceFactory::IsHotwordAllowed(profile)) {
+ // Don't need to check the field trial here since |IsHotwordAllowed| also
+ // checks it.
+ if (HotwordServiceFactory::IsHotwordAllowed(profile)) {
// Update the current error value.
HotwordServiceFactory::IsServiceAvailable(profile);
int error = HotwordServiceFactory::GetCurrentError(profile);
« no previous file with comments | « chrome/browser/search/hotword_service_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698