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

Unified Diff: chrome/browser/ui/webui/voice_search_ui.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/ui/webui/voice_search_ui.cc
diff --git a/chrome/browser/ui/webui/voice_search_ui.cc b/chrome/browser/ui/webui/voice_search_ui.cc
index 3ddf0e949eb2de60e954163c0b93ba8497e634af..6731445ba4b49ed0a4761a55091f49b390d14f7e 100644
--- a/chrome/browser/ui/webui/voice_search_ui.cc
+++ b/chrome/browser/ui/webui/voice_search_ui.cc
@@ -168,12 +168,9 @@ class VoiceSearchDomHandler : public WebUIMessageHandler {
AddHotwordInfo(list.get());
AddAppListInfo(list.get());
- std::string extension_id = extension_misc::kHotwordExtensionId;
- HotwordService* hotword_service =
- HotwordServiceFactory::GetForProfile(profile_);
- if (hotword_service && hotword_service->IsExperimentalHotwordingEnabled())
- extension_id = extension_misc::kHotwordNewExtensionId;
- AddExtensionInfo(extension_id, "Extension", list.get());
+ AddExtensionInfo(extension_misc::kHotwordNewExtensionId,
+ "Extension",
+ list.get());
AddExtensionInfo(extension_misc::kHotwordSharedModuleId,
"Shared Module",
@@ -326,11 +323,6 @@ class VoiceSearchDomHandler : public WebUIMessageHandler {
hotword_internal::kHotwordFieldTrialName);
AddPair(list, "Field trial", group);
- std::string new_hotwording_enabled = "No";
- if (hotword_service && hotword_service->IsExperimentalHotwordingEnabled())
- new_hotwording_enabled = "Yes";
- AddPair(list, "New Hotwording Enabled", new_hotwording_enabled);
-
AddLineBreak(list);
}
« no previous file with comments | « chrome/browser/ui/webui/options/browser_options_handler.cc ('k') | chrome/common/extensions/api/_permission_features.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698