Commit 8b3cee93 authored by evliu's avatar evliu Committed by Commit Bot

Remove the SODA component from non-SODA builds

This CL removes the registration of the SODA component for builds with
the enable_soda build flag disabled.

Bug: 1110086
Change-Id: I9b55fde2de20ca24909fcc8bca5de65141128ab6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2321516Reviewed-by: default avatarJoshua Pawlicki <waffles@chromium.org>
Commit-Queue: Evan Liu <evliu@google.com>
Cr-Commit-Position: refs/heads/master@{#792298}
parent e568a968
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
#include "build/build_config.h" #include "build/build_config.h"
#include "chrome/browser/browser_process.h" #include "chrome/browser/browser_process.h"
#include "chrome/common/pref_names.h" #include "chrome/common/pref_names.h"
#include "chrome/services/speech/buildflags.h"
#include "components/component_updater/component_updater_service.h" #include "components/component_updater/component_updater_service.h"
#include "components/crx_file/id_util.h" #include "components/crx_file/id_util.h"
#include "components/soda/constants.h" #include "components/soda/constants.h"
...@@ -130,7 +131,7 @@ void RegisterSODAComponent(ComponentUpdateService* cus, ...@@ -130,7 +131,7 @@ void RegisterSODAComponent(ComponentUpdateService* cus,
PrefService* prefs, PrefService* prefs,
base::OnceClosure callback) { base::OnceClosure callback) {
DCHECK_CURRENTLY_ON(BrowserThread::UI); DCHECK_CURRENTLY_ON(BrowserThread::UI);
#if BUILDFLAG(ENABLE_SODA)
auto installer = base::MakeRefCounted<ComponentInstaller>( auto installer = base::MakeRefCounted<ComponentInstaller>(
std::make_unique<SODAComponentInstallerPolicy>(base::BindRepeating( std::make_unique<SODAComponentInstallerPolicy>(base::BindRepeating(
[](ComponentUpdateService* cus, PrefService* prefs, [](ComponentUpdateService* cus, PrefService* prefs,
...@@ -161,6 +162,7 @@ void RegisterSODAComponent(ComponentUpdateService* cus, ...@@ -161,6 +162,7 @@ void RegisterSODAComponent(ComponentUpdateService* cus,
cus, prefs)); cus, prefs));
} }
} }
#endif
} }
bool UninstallSODAComponent(ComponentUpdateService* cus, PrefService* prefs) { bool UninstallSODAComponent(ComponentUpdateService* cus, PrefService* prefs) {
......
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