Commit 7c24fc13 authored by evliu's avatar evliu Committed by Chromium LUCI CQ

Register SODA language pack component only if the Live caption feature is enabled

This CL adds a check to only register the SODA language pack component if the LiveCaption and UseSodaForLiveCaption features are enabled as well as the Live caption toggle switch.

Bug: 1156412
Change-Id: Icede8bd752c6617ca16a0f55da926cd8ab0b1675
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2590625Reviewed-by: default avatarJoshua Pawlicki <waffles@chromium.org>
Commit-Queue: Evan Liu <evliu@google.com>
Cr-Commit-Position: refs/heads/master@{#836870}
parent 22116927
...@@ -222,25 +222,28 @@ void RegisterSodaLanguageComponent(ComponentUpdateService* cus, ...@@ -222,25 +222,28 @@ void RegisterSodaLanguageComponent(ComponentUpdateService* cus,
PrefService* global_prefs) { PrefService* global_prefs) {
DCHECK_CURRENTLY_ON(BrowserThread::UI); DCHECK_CURRENTLY_ON(BrowserThread::UI);
if (base::FeatureList::IsEnabled(media::kUseSodaForLiveCaption)) { if (base::FeatureList::IsEnabled(media::kUseSodaForLiveCaption) &&
speech::LanguageCode language = speech::GetLanguageCode( base::FeatureList::IsEnabled(media::kLiveCaption)) {
profile_prefs->GetString(prefs::kLiveCaptionLanguageCode)); if (profile_prefs->GetBoolean(prefs::kLiveCaptionEnabled)) {
switch (language) { speech::LanguageCode language = speech::GetLanguageCode(
case speech::LanguageCode::kNone: profile_prefs->GetString(prefs::kLiveCaptionLanguageCode));
// Do nothing. switch (language) {
break; case speech::LanguageCode::kNone:
case speech::LanguageCode::kEnUs: // Do nothing.
RegisterSodaEnUsComponent( break;
cus, global_prefs, case speech::LanguageCode::kEnUs:
base::BindOnce(&SodaEnUsComponentInstallerPolicy:: RegisterSodaEnUsComponent(
UpdateSodaEnUsComponentOnDemand)); cus, global_prefs,
break; base::BindOnce(&SodaEnUsComponentInstallerPolicy::
case speech::LanguageCode::kJaJp: UpdateSodaEnUsComponentOnDemand));
RegisterSodaJaJpComponent( break;
cus, global_prefs, case speech::LanguageCode::kJaJp:
base::BindOnce(&SodaJaJpComponentInstallerPolicy:: RegisterSodaJaJpComponent(
UpdateSodaJaJpComponentOnDemand)); cus, global_prefs,
break; base::BindOnce(&SodaJaJpComponentInstallerPolicy::
UpdateSodaJaJpComponentOnDemand));
break;
}
} }
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment