| Index: chrome/browser/search/hotword_service.cc
|
| diff --git a/chrome/browser/search/hotword_service.cc b/chrome/browser/search/hotword_service.cc
|
| index f12ef059c4b7384b4f1a159e0a961b94ac319364..0a082cf1ad7d0ced80cc4bb9dfbb42459884b613 100644
|
| --- a/chrome/browser/search/hotword_service.cc
|
| +++ b/chrome/browser/search/hotword_service.cc
|
| @@ -389,8 +389,16 @@ bool HotwordService::IsServiceAvailable() {
|
| ExtensionService* service = system->extension_service();
|
| // Include disabled extensions (true parameter) since it may not be enabled
|
| // if the user opted out.
|
| + std::string extensionId;
|
| + if (IsExperimentalHotwordingEnabled()) {
|
| + // TODO(amistry): Handle reloading on language change as the old extension
|
| + // does.
|
| + extensionId = extension_misc::kHotwordSharedModuleId;
|
| + } else {
|
| + extensionId = extension_misc::kHotwordExtensionId;
|
| + }
|
| const extensions::Extension* extension =
|
| - service->GetExtensionById(extension_misc::kHotwordExtensionId, true);
|
| + service->GetExtensionById(extensionId, true);
|
| if (!extension)
|
| error_message_ = IDS_HOTWORD_GENERIC_ERROR_MESSAGE;
|
|
|
|
|