Chromium Code Reviews| 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..a0c51bfd4bcfb152f63697777749cb8604e03483 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,15 @@ 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)) |
| - g_browser_process->crl_set_fetcher()->StartInitialLoad(cus); |
| + if (g_browser_process->crl_set_fetcher()) { |
|
sky
2013/03/26 21:04:44
combine with previous if
jvoung (off chromium)
2013/03/26 21:33:34
Done.
|
| + 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(); |
| } |