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 421 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
432 if (PathService::Get(chrome::DIR_USER_DATA, &path)) { | 432 if (PathService::Get(chrome::DIR_USER_DATA, &path)) { |
433 #if defined(OS_ANDROID) | 433 #if defined(OS_ANDROID) |
434 // The CRLSet component was enabled for some releases. This code attempts to | 434 // The CRLSet component was enabled for some releases. This code attempts to |
435 // delete it from the local disk of those how may have downloaded it. | 435 // delete it from the local disk of those how may have downloaded it. |
436 g_browser_process->crl_set_fetcher()->DeleteFromDisk(path); | 436 g_browser_process->crl_set_fetcher()->DeleteFromDisk(path); |
437 #elif !defined(OS_CHROMEOS) | 437 #elif !defined(OS_CHROMEOS) |
438 // CRLSetFetcher attempts to load a CRL set from either the local disk or | 438 // CRLSetFetcher attempts to load a CRL set from either the local disk or |
439 // network. | 439 // network. |
440 // For Chrome OS this registration is delayed until user login. | 440 // For Chrome OS this registration is delayed until user login. |
441 g_browser_process->crl_set_fetcher()->StartInitialLoad(cus, path); | 441 g_browser_process->crl_set_fetcher()->StartInitialLoad(cus, path); |
| 442 // Registration of the EV Whitelist component here is not necessary for: |
| 443 // 1. Android: Because it currently does not have the EV indicator. |
| 444 // 2. Chrome OS: On Chrome OS this registration is delayed until user login. |
| 445 RegisterEVWhitelistComponent(cus, path); |
442 #endif | 446 #endif |
443 } | 447 } |
444 | 448 |
445 #if !defined(OS_ANDROID) | |
446 // Android does not currently have the EV indicator. No need to get the | |
447 // EV certs whitelist on Android, then. | |
448 RegisterEVWhitelistComponent(cus); | |
449 #endif | |
450 | |
451 #if defined(OS_WIN) | 449 #if defined(OS_WIN) |
452 RegisterSwReporterComponent(cus, g_browser_process->local_state()); | 450 RegisterSwReporterComponent(cus, g_browser_process->local_state()); |
453 #endif | 451 #endif |
454 | 452 |
455 cus->Start(); | 453 cus->Start(); |
456 } | 454 } |
457 | 455 |
458 #if !defined(OS_ANDROID) | 456 #if !defined(OS_ANDROID) |
459 bool ProcessSingletonNotificationCallback( | 457 bool ProcessSingletonNotificationCallback( |
460 const CommandLine& command_line, | 458 const CommandLine& command_line, |
(...skipping 1264 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1725 chromeos::CrosSettings::Shutdown(); | 1723 chromeos::CrosSettings::Shutdown(); |
1726 #endif | 1724 #endif |
1727 #endif | 1725 #endif |
1728 } | 1726 } |
1729 | 1727 |
1730 // Public members: | 1728 // Public members: |
1731 | 1729 |
1732 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 1730 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
1733 chrome_extra_parts_.push_back(parts); | 1731 chrome_extra_parts_.push_back(parts); |
1734 } | 1732 } |
OLD | NEW |