| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/chrome_browser_main.h" | 5 #include "chrome/browser/chrome_browser_main.h" |
| 6 | 6 |
| 7 #include <set> | 7 #include <set> |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 369 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 380 component_updater::ComponentUpdateService* cus = | 380 component_updater::ComponentUpdateService* cus = |
| 381 g_browser_process->component_updater(); | 381 g_browser_process->component_updater(); |
| 382 | 382 |
| 383 // Registration can be before or after cus->Start() so it is ok to post | 383 // Registration can be before or after cus->Start() so it is ok to post |
| 384 // a task to the UI thread to do registration once you done the necessary | 384 // a task to the UI thread to do registration once you done the necessary |
| 385 // file IO to know you existing component version. | 385 // file IO to know you existing component version. |
| 386 #if !defined(OS_CHROMEOS) && !defined(OS_ANDROID) | 386 #if !defined(OS_CHROMEOS) && !defined(OS_ANDROID) |
| 387 RegisterRecoveryComponent(cus, g_browser_process->local_state()); | 387 RegisterRecoveryComponent(cus, g_browser_process->local_state()); |
| 388 RegisterPepperFlashComponent(cus); | 388 RegisterPepperFlashComponent(cus); |
| 389 RegisterSwiftShaderComponent(cus); | 389 RegisterSwiftShaderComponent(cus); |
| 390 #endif | |
| 391 | |
| 392 #if !defined(OS_ANDROID) | |
| 393 g_browser_process->pnacl_component_installer()->RegisterPnaclComponent( | 390 g_browser_process->pnacl_component_installer()->RegisterPnaclComponent( |
| 394 cus, command_line); | 391 cus, command_line); |
| 395 #endif | |
| 396 | |
| 397 #if !defined(OS_CHROMEOS) && !defined(OS_ANDROID) | |
| 398 RegisterWidevineCdmComponent(cus); | 392 RegisterWidevineCdmComponent(cus); |
| 399 #endif | 393 #endif |
| 400 | 394 |
| 401 #if !defined(OS_CHROMEOS) && !defined(OS_ANDROID) | 395 #if !defined(OS_CHROMEOS) && !defined(OS_ANDROID) |
| 402 // CRLSetFetcher attempts to load a CRL set from either the local disk or | 396 // CRLSetFetcher attempts to load a CRL set from either the local disk or |
| 403 // network. | 397 // network. |
| 404 if (!command_line.HasSwitch(switches::kDisableCRLSets)) | 398 if (!command_line.HasSwitch(switches::kDisableCRLSets)) |
| 405 g_browser_process->crl_set_fetcher()->StartInitialLoad(cus); | 399 g_browser_process->crl_set_fetcher()->StartInitialLoad(cus); |
| 406 #elif defined(OS_ANDROID) | 400 #elif defined(OS_ANDROID) |
| 407 // The CRLSet component was enabled for some releases. This code attempts to | 401 // The CRLSet component was enabled for some releases. This code attempts to |
| (...skipping 1247 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1655 chromeos::CrosSettings::Shutdown(); | 1649 chromeos::CrosSettings::Shutdown(); |
| 1656 #endif | 1650 #endif |
| 1657 #endif | 1651 #endif |
| 1658 } | 1652 } |
| 1659 | 1653 |
| 1660 // Public members: | 1654 // Public members: |
| 1661 | 1655 |
| 1662 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 1656 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
| 1663 chrome_extra_parts_.push_back(parts); | 1657 chrome_extra_parts_.push_back(parts); |
| 1664 } | 1658 } |
| OLD | NEW |