chrome/browser/extensions/component_loader.cc - Issue 423083002: Add new hotword extension for built-in hotword triggering.

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 423083002: Add new hotword extension for built-in hotword triggering. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase onto 442183002 Created 6 years, 4 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/browser_resources.grd ('k') | chrome/browser/extensions/external_component_loader.cc » ('j') | chrome/browser/resources/hotword/manifest.json » ('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 db9e40d6bba6868346242bdb0f704326813c01cc..fceeeab2aadcb059dfa35f996298585393ac4d44 100644

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

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

@@ -308,8 +308,14 @@ void ComponentLoader::AddHangoutServicesExtension() {

void ComponentLoader::AddHotwordHelperExtension() {

#if defined(ENABLE_EXTENSIONS)

if (HotwordServiceFactory::IsHotwordAllowed(browser_context_)) {

- Add(IDR_HOTWORD_HELPER_MANIFEST,

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

+ CommandLine* command_line = CommandLine::ForCurrentProcess();

+ if (command_line->HasSwitch(switches::kEnableBuiltInHotword)) {

+ Add(IDR_HOTWORD_MANIFEST,

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

+ } else {

+ Add(IDR_HOTWORD_HELPER_MANIFEST,

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

+ }

}

#endif

}