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 26 matching lines...) Expand all Loading... |
37 #include "base/values.h" | 37 #include "base/values.h" |
38 #include "build/build_config.h" | 38 #include "build/build_config.h" |
39 #include "chrome/browser/about_flags.h" | 39 #include "chrome/browser/about_flags.h" |
40 #include "chrome/browser/browser_process.h" | 40 #include "chrome/browser/browser_process.h" |
41 #include "chrome/browser/browser_process_impl.h" | 41 #include "chrome/browser/browser_process_impl.h" |
42 #include "chrome/browser/browser_process_platform_part.h" | 42 #include "chrome/browser/browser_process_platform_part.h" |
43 #include "chrome/browser/browser_shutdown.h" | 43 #include "chrome/browser/browser_shutdown.h" |
44 #include "chrome/browser/chrome_browser_main_extra_parts.h" | 44 #include "chrome/browser/chrome_browser_main_extra_parts.h" |
45 #include "chrome/browser/component_updater/cld_component_installer.h" | 45 #include "chrome/browser/component_updater/cld_component_installer.h" |
46 #include "chrome/browser/component_updater/component_updater_service.h" | 46 #include "chrome/browser/component_updater/component_updater_service.h" |
| 47 #include "chrome/browser/component_updater/ev_whitelist_component_installer.h" |
47 #include "chrome/browser/component_updater/flash_component_installer.h" | 48 #include "chrome/browser/component_updater/flash_component_installer.h" |
48 #include "chrome/browser/component_updater/pnacl/pnacl_component_installer.h" | 49 #include "chrome/browser/component_updater/pnacl/pnacl_component_installer.h" |
49 #include "chrome/browser/component_updater/recovery_component_installer.h" | 50 #include "chrome/browser/component_updater/recovery_component_installer.h" |
50 #include "chrome/browser/component_updater/swiftshader_component_installer.h" | 51 #include "chrome/browser/component_updater/swiftshader_component_installer.h" |
51 #include "chrome/browser/component_updater/widevine_cdm_component_installer.h" | 52 #include "chrome/browser/component_updater/widevine_cdm_component_installer.h" |
52 #include "chrome/browser/defaults.h" | 53 #include "chrome/browser/defaults.h" |
53 #include "chrome/browser/extensions/extension_service.h" | 54 #include "chrome/browser/extensions/extension_service.h" |
54 #include "chrome/browser/extensions/startup_helper.h" | 55 #include "chrome/browser/extensions/startup_helper.h" |
55 #include "chrome/browser/first_run/first_run.h" | 56 #include "chrome/browser/first_run/first_run.h" |
56 #include "chrome/browser/first_run/upgrade_util.h" | 57 #include "chrome/browser/first_run/upgrade_util.h" |
(...skipping 349 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
406 // delete it from the local disk of those how may have downloaded it. | 407 // delete it from the local disk of those how may have downloaded it. |
407 g_browser_process->crl_set_fetcher()->DeleteFromDisk(path); | 408 g_browser_process->crl_set_fetcher()->DeleteFromDisk(path); |
408 #elif !defined(OS_CHROMEOS) | 409 #elif !defined(OS_CHROMEOS) |
409 // CRLSetFetcher attempts to load a CRL set from either the local disk or | 410 // CRLSetFetcher attempts to load a CRL set from either the local disk or |
410 // network. | 411 // network. |
411 // For Chrome OS this registration is delayed until user login. | 412 // For Chrome OS this registration is delayed until user login. |
412 g_browser_process->crl_set_fetcher()->StartInitialLoad(cus, path); | 413 g_browser_process->crl_set_fetcher()->StartInitialLoad(cus, path); |
413 #endif | 414 #endif |
414 } | 415 } |
415 | 416 |
| 417 #if !defined(OS_ANDROID) |
| 418 // Android does not currently have the EV indicator. No need to get the |
| 419 // EV certs whitelist on Android, then. |
| 420 RegisterEVWhitelistComponent(cus); |
| 421 #endif |
| 422 |
416 #if defined(OS_WIN) | 423 #if defined(OS_WIN) |
417 ExecutePendingSwReporter(cus, g_browser_process->local_state()); | 424 ExecutePendingSwReporter(cus, g_browser_process->local_state()); |
418 #endif | 425 #endif |
419 | 426 |
420 cus->Start(); | 427 cus->Start(); |
421 } | 428 } |
422 | 429 |
423 #if !defined(OS_ANDROID) | 430 #if !defined(OS_ANDROID) |
424 bool ProcessSingletonNotificationCallback( | 431 bool ProcessSingletonNotificationCallback( |
425 const CommandLine& command_line, | 432 const CommandLine& command_line, |
(...skipping 1225 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1651 chromeos::CrosSettings::Shutdown(); | 1658 chromeos::CrosSettings::Shutdown(); |
1652 #endif | 1659 #endif |
1653 #endif | 1660 #endif |
1654 } | 1661 } |
1655 | 1662 |
1656 // Public members: | 1663 // Public members: |
1657 | 1664 |
1658 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 1665 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
1659 chrome_extra_parts_.push_back(parts); | 1666 chrome_extra_parts_.push_back(parts); |
1660 } | 1667 } |
OLD | NEW |