| Index: chrome/browser/extensions/external_component_loader.cc
|
| diff --git a/chrome/browser/extensions/external_component_loader.cc b/chrome/browser/extensions/external_component_loader.cc
|
| index 10eb0ec145c2570f7f632cc244533d967576b44e..7b66afe41c43b84bcec7b503292d5e25efc339f2 100644
|
| --- a/chrome/browser/extensions/external_component_loader.cc
|
| +++ b/chrome/browser/extensions/external_component_loader.cc
|
| @@ -4,13 +4,19 @@
|
|
|
| #include "chrome/browser/extensions/external_component_loader.h"
|
|
|
| +#include "base/command_line.h"
|
| #include "chrome/browser/bookmarks/enhanced_bookmarks_features.h"
|
| #include "chrome/browser/browser_process.h"
|
| -#include "chrome/browser/search/hotword_service_factory.h"
|
| #include "chrome/browser/signin/signin_manager_factory.h"
|
| +#include "chrome/common/chrome_switches.h"
|
| #include "chrome/common/extensions/extension_constants.h"
|
| #include "components/signin/core/browser/signin_manager.h"
|
|
|
| +// TODO(thestig): Remove after extensions are disabled on mobile.
|
| +#if defined(ENABLE_EXTENSIONS)
|
| +#include "chrome/browser/search/hotword_service_factory.h"
|
| +#endif
|
| +
|
| namespace {
|
|
|
| bool IsUserSignedin(Profile* profile) {
|
| @@ -34,11 +40,18 @@ void ExternalComponentLoader::StartLoading() {
|
| prefs_->SetString(appId + ".external_update_url",
|
| extension_urls::GetWebstoreUpdateUrl().spec());
|
|
|
| +#if defined(ENABLE_EXTENSIONS)
|
| if (HotwordServiceFactory::IsHotwordAllowed(profile_)) {
|
| std::string hotwordId = extension_misc::kHotwordExtensionId;
|
| - prefs_->SetString(hotwordId + ".external_update_url",
|
| - extension_urls::GetWebstoreUpdateUrl().spec());
|
| + 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());
|
| + }
|
| }
|
| +#endif
|
|
|
| UpdateBookmarksExperimentState(
|
| profile_->GetPrefs(),
|
|
|