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

Unified Diff: chrome/browser/chrome_browser_main.cc

Issue 2683113006: Revert of Simplify the registration of the Chrome Recovery component. (Closed)
Patch Set: 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 98690ba3dd2b51807e33f706e721f2a5bae8bede..0a1c5f7a82ef650404b01bb6ee28dcc9bb10ee71 100644
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -468,14 +468,19 @@
#endif // defined(OS_MACOSX)
void RegisterComponentsForUpdate() {
- const auto cus = g_browser_process->component_updater();
-
+ component_updater::ComponentUpdateService* 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());
-
-#if !defined(OS_ANDROID)
+#endif // !defined(OS_CHROMEOS)
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