diff options
author | amistry <amistry@chromium.org> | 2014-09-25 22:33:35 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-09-26 05:33:49 +0000 |
commit | 075d1694c7f5594a923bb6275cbbd21f0cfa2441 (patch) | |
tree | 978a69c291051e56e54054f2d684ca901b8a1423 /chrome/browser/extensions | |
parent | 84eeb930246ca5c093e429d0b869327b3b3abb38 (diff) | |
download | chromium_src-075d1694c7f5594a923bb6275cbbd21f0cfa2441.zip chromium_src-075d1694c7f5594a923bb6275cbbd21f0cfa2441.tar.gz chromium_src-075d1694c7f5594a923bb6275cbbd21f0cfa2441.tar.bz2 |
Replace placeholder extension ID for hotwording shared module with ID of module uploaded to the Chrome web store.
Also, auto-install hotword shared module when hotwording is enabled.
BUG=397019
Review URL: https://codereview.chromium.org/599053004
Cr-Commit-Position: refs/heads/master@{#296890}
Diffstat (limited to 'chrome/browser/extensions')
-rw-r--r-- | chrome/browser/extensions/external_component_loader.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/chrome/browser/extensions/external_component_loader.cc b/chrome/browser/extensions/external_component_loader.cc index efdd2964..80fa558 100644 --- a/chrome/browser/extensions/external_component_loader.cc +++ b/chrome/browser/extensions/external_component_loader.cc @@ -50,12 +50,11 @@ void ExternalComponentLoader::StartLoading() { if (HotwordServiceFactory::IsHotwordAllowed(profile_)) { std::string hotwordId = extension_misc::kHotwordExtensionId; CommandLine* command_line = CommandLine::ForCurrentProcess(); - // TODO(amistry): Load the hotword shared module when enabling built-in - // hotword detection. - if (!command_line->HasSwitch(switches::kEnableExperimentalHotwording)) { - prefs_->SetString(hotwordId + ".external_update_url", - extension_urls::GetWebstoreUpdateUrl().spec()); + if (command_line->HasSwitch(switches::kEnableExperimentalHotwording)) { + hotwordId = extension_misc::kHotwordSharedModuleId; } + prefs_->SetString(hotwordId + ".external_update_url", + extension_urls::GetWebstoreUpdateUrl().spec()); } InitBookmarksExperimentState(profile_); |