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

Unified Diff: chrome/browser/chrome_browser_main.cc

Issue 13071002: Turn on component updater on chromeos, only for the pnacl component. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: filepath Created 7 years, 9 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
Index: chrome/browser/chrome_browser_main.cc
diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
index d7f2f648b0a65f3465316190b3c67627705da54f..039c36b2ac9e89c45b5bd7135ea459f5afd595eb 100644
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -480,16 +480,22 @@ void RegisterComponentsForUpdate(const CommandLine& command_line) {
// Registration can be before of 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_CHROMEOS)
RegisterRecoveryComponent(cus, g_browser_process->local_state());
RegisterPepperFlashComponent(cus);
RegisterSwiftShaderComponent(cus);
// CRLSetFetcher attempts to load a CRL set from either the local disk or
// network.
- if (!command_line.HasSwitch(switches::kDisableCRLSets))
+ if (!command_line.HasSwitch(switches::kDisableCRLSets)
+ && g_browser_process->crl_set_fetcher())
g_browser_process->crl_set_fetcher()->StartInitialLoad(cus);
+#endif
- RegisterPnaclComponent(cus, command_line);
+ if (g_browser_process->pnacl_component_installer()) {
+ g_browser_process->pnacl_component_installer()->RegisterPnaclComponent(
+ cus, command_line);
+ }
cus->Start();
}

Powered by Google App Engine
This is Rietveld 408576698