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..f0adeadb3d0c66d295ebe2073bbbb8c37d3997be 100644 |
--- a/chrome/browser/chrome_browser_main.cc |
+++ b/chrome/browser/chrome_browser_main.cc |
@@ -480,6 +480,7 @@ 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); |
@@ -487,9 +488,13 @@ void RegisterComponentsForUpdate(const CommandLine& command_line) { |
// CRLSetFetcher attempts to load a CRL set from either the local disk or |
// network. |
if (!command_line.HasSwitch(switches::kDisableCRLSets)) |
Dmitry Polukhin
2013/03/26 11:59:56
Nit, please add {} around inner if.
jvoung - send to chromium...
2013/03/26 15:46:53
Done.
|
- g_browser_process->crl_set_fetcher()->StartInitialLoad(cus); |
+ if (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()) |
Dmitry Polukhin
2013/03/26 11:59:56
Nit, same here. If-body has more than 1 line so it
jvoung - send to chromium...
2013/03/26 15:46:53
Done.
|
+ g_browser_process->pnacl_component_installer()->RegisterPnaclComponent( |
+ cus, command_line); |
cus->Start(); |
} |