chrome/browser/extensions/component_loader.cc - Issue 992173002: Delete the old hotwording integration.

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/extensions/component_loader.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/extensions/api/hotword_private/hotword_private_api.cc ('k') | chrome/browser/extensions/external_component_loader.cc » ('j') | chrome/browser/search/hotword_service.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/component_loader.cc

diff --git a/chrome/browser/extensions/component_loader.cc b/chrome/browser/extensions/component_loader.cc

index 9c60dd78dc38ab5dd5659ce297ba7096c2ca60c6..6e41bb74c55dcc143d9a3a88db4cec3ad2390cb5 100644

--- a/chrome/browser/extensions/component_loader.cc

+++ b/chrome/browser/extensions/component_loader.cc

@@ -334,8 +334,7 @@ void ComponentLoader::AddHangoutServicesExtension() {

}

void ComponentLoader::AddHotwordAudioVerificationApp() {

- if (HotwordService::IsExperimentalHotwordingEnabled() &&

- HotwordServiceFactory::IsAlwaysOnAvailable()) {

+ if (HotwordServiceFactory::IsAlwaysOnAvailable()) {

Add(IDR_HOTWORD_AUDIO_VERIFICATION_MANIFEST,

base::FilePath(FILE_PATH_LITERAL("hotword_audio_verification")));

}

@@ -343,13 +342,8 @@ void ComponentLoader::AddHotwordAudioVerificationApp() {

void ComponentLoader::AddHotwordHelperExtension() {

if (HotwordServiceFactory::IsHotwordAllowed(browser_context_)) {

- if (HotwordService::IsExperimentalHotwordingEnabled()) {

- Add(IDR_HOTWORD_MANIFEST,

- base::FilePath(FILE_PATH_LITERAL("hotword")));

- } else {

- Add(IDR_HOTWORD_HELPER_MANIFEST,

- base::FilePath(FILE_PATH_LITERAL("hotword_helper")));

- }

+ Add(IDR_HOTWORD_MANIFEST,

+ base::FilePath(FILE_PATH_LITERAL("hotword")));

}