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 381 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
392 RegisterPepperFlashComponent(cus); | 392 RegisterPepperFlashComponent(cus); |
393 RegisterSwiftShaderComponent(cus); | 393 RegisterSwiftShaderComponent(cus); |
394 g_browser_process->pnacl_component_installer()->RegisterPnaclComponent(cus); | 394 g_browser_process->pnacl_component_installer()->RegisterPnaclComponent(cus); |
395 RegisterWidevineCdmComponent(cus); | 395 RegisterWidevineCdmComponent(cus); |
396 #endif | 396 #endif |
397 | 397 |
398 #if defined(CLD_DATA_FROM_COMPONENT) | 398 #if defined(CLD_DATA_FROM_COMPONENT) |
399 RegisterCldComponent(cus); | 399 RegisterCldComponent(cus); |
400 #endif | 400 #endif |
401 | 401 |
402 base::FilePath path; | |
403 if (PathService::Get(chrome::DIR_USER_DATA, &path)) { | |
402 #if !defined(OS_CHROMEOS) && !defined(OS_ANDROID) | 404 #if !defined(OS_CHROMEOS) && !defined(OS_ANDROID) |
403 // CRLSetFetcher attempts to load a CRL set from either the local disk or | 405 // CRLSetFetcher attempts to load a CRL set from either the local disk or |
404 // network. | 406 // network. |
Ryan Sleevi
2014/07/18 19:17:56
Perhaps add a comment as to where ChromeOS does in
| |
405 g_browser_process->crl_set_fetcher()->StartInitialLoad(cus); | 407 g_browser_process->crl_set_fetcher()->StartInitialLoad(cus, path); |
406 #elif defined(OS_ANDROID) | 408 #elif defined(OS_ANDROID) |
407 // The CRLSet component was enabled for some releases. This code attempts to | 409 // The CRLSet component was enabled for some releases. This code attempts to |
408 // delete it from the local disk of those how may have downloaded it. | 410 // delete it from the local disk of those how may have downloaded it. |
409 g_browser_process->crl_set_fetcher()->DeleteFromDisk(); | 411 g_browser_process->crl_set_fetcher()->DeleteFromDisk(path); |
410 #endif | 412 #endif |
413 } | |
411 | 414 |
412 #if defined(OS_WIN) | 415 #if defined(OS_WIN) |
413 ExecutePendingSwReporter(cus, g_browser_process->local_state()); | 416 ExecutePendingSwReporter(cus, g_browser_process->local_state()); |
414 #endif | 417 #endif |
415 | 418 |
416 cus->Start(); | 419 cus->Start(); |
417 } | 420 } |
418 | 421 |
419 #if !defined(OS_ANDROID) | 422 #if !defined(OS_ANDROID) |
420 bool ProcessSingletonNotificationCallback( | 423 bool ProcessSingletonNotificationCallback( |
(...skipping 1228 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1649 chromeos::CrosSettings::Shutdown(); | 1652 chromeos::CrosSettings::Shutdown(); |
1650 #endif | 1653 #endif |
1651 #endif | 1654 #endif |
1652 } | 1655 } |
1653 | 1656 |
1654 // Public members: | 1657 // Public members: |
1655 | 1658 |
1656 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 1659 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
1657 chrome_extra_parts_.push_back(parts); | 1660 chrome_extra_parts_.push_back(parts); |
1658 } | 1661 } |
OLD | NEW |