Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(196)

Unified Diff: chrome/browser/chrome_browser_main.cc

Issue 2686863004: Simplify the registration of the Chrome Recovery component. (Closed)
Patch Set: fix broken chromium build Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/component_updater/recovery_component_installer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chrome_browser_main.cc
diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
index 0cbbdd09e2daec2d613451a97828798195988c8a..8dfbb51f90080a3146b494ed8fdc717772d8de93 100644
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -472,19 +472,14 @@ OSStatus KeychainCallback(SecKeychainEvent keychain_event,
#endif // defined(OS_MACOSX)
void RegisterComponentsForUpdate() {
- component_updater::ComponentUpdateService* cus =
- g_browser_process->component_updater();
+ const auto cus = g_browser_process->component_updater();
- // Registration can be before or after cus->Start() so it is ok to post
- // a task to the UI thread to do registration once you done the necessary
- // file IO to know you existing component version.
-#if !defined(OS_ANDROID)
-#if !defined(OS_CHROMEOS)
if (base::FeatureList::IsEnabled(features::kImprovedRecoveryComponent))
RegisterRecoveryImprovedComponent(cus, g_browser_process->local_state());
else
RegisterRecoveryComponent(cus, g_browser_process->local_state());
-#endif // !defined(OS_CHROMEOS)
+
+#if !defined(OS_ANDROID)
RegisterPepperFlashComponent(cus);
#if !defined(OS_CHROMEOS)
RegisterSwiftShaderComponent(cus);
« no previous file with comments | « no previous file | chrome/browser/component_updater/recovery_component_installer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698