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