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 <stddef.h> | 7 #include <stddef.h> |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 | 9 |
10 #include <set> | 10 #include <set> |
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
45 #include "base/values.h" | 45 #include "base/values.h" |
46 #include "build/build_config.h" | 46 #include "build/build_config.h" |
47 #include "cc/base/switches.h" | 47 #include "cc/base/switches.h" |
48 #include "chrome/browser/about_flags.h" | 48 #include "chrome/browser/about_flags.h" |
49 #include "chrome/browser/after_startup_task_utils.h" | 49 #include "chrome/browser/after_startup_task_utils.h" |
50 #include "chrome/browser/browser_process.h" | 50 #include "chrome/browser/browser_process.h" |
51 #include "chrome/browser/browser_process_impl.h" | 51 #include "chrome/browser/browser_process_impl.h" |
52 #include "chrome/browser/browser_process_platform_part.h" | 52 #include "chrome/browser/browser_process_platform_part.h" |
53 #include "chrome/browser/browser_shutdown.h" | 53 #include "chrome/browser/browser_shutdown.h" |
54 #include "chrome/browser/chrome_browser_main_extra_parts.h" | 54 #include "chrome/browser/chrome_browser_main_extra_parts.h" |
55 #include "chrome/browser/component_updater/ev_whitelist_component_installer.h" | |
56 #include "chrome/browser/component_updater/file_type_policies_component_installe
r.h" | 55 #include "chrome/browser/component_updater/file_type_policies_component_installe
r.h" |
57 #include "chrome/browser/component_updater/origin_trials_component_installer.h" | 56 #include "chrome/browser/component_updater/origin_trials_component_installer.h" |
58 #include "chrome/browser/component_updater/pepper_flash_component_installer.h" | 57 #include "chrome/browser/component_updater/pepper_flash_component_installer.h" |
59 #include "chrome/browser/component_updater/recovery_component_installer.h" | 58 #include "chrome/browser/component_updater/recovery_component_installer.h" |
60 #include "chrome/browser/component_updater/recovery_improved_component_installer
.h" | 59 #include "chrome/browser/component_updater/recovery_improved_component_installer
.h" |
61 #include "chrome/browser/component_updater/sth_set_component_installer.h" | 60 #include "chrome/browser/component_updater/sth_set_component_installer.h" |
62 #include "chrome/browser/component_updater/subresource_filter_component_installe
r.h" | 61 #include "chrome/browser/component_updater/subresource_filter_component_installe
r.h" |
63 #include "chrome/browser/component_updater/supervised_user_whitelist_installer.h
" | 62 #include "chrome/browser/component_updater/supervised_user_whitelist_installer.h
" |
64 #include "chrome/browser/component_updater/widevine_cdm_component_installer.h" | 63 #include "chrome/browser/component_updater/widevine_cdm_component_installer.h" |
65 #include "chrome/browser/defaults.h" | 64 #include "chrome/browser/defaults.h" |
(...skipping 438 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
504 if (PathService::Get(chrome::DIR_USER_DATA, &path)) { | 503 if (PathService::Get(chrome::DIR_USER_DATA, &path)) { |
505 #if defined(OS_ANDROID) | 504 #if defined(OS_ANDROID) |
506 // The CRLSet component was enabled for some releases. This code attempts to | 505 // The CRLSet component was enabled for some releases. This code attempts to |
507 // delete it from the local disk of those how may have downloaded it. | 506 // delete it from the local disk of those how may have downloaded it. |
508 g_browser_process->crl_set_fetcher()->DeleteFromDisk(path); | 507 g_browser_process->crl_set_fetcher()->DeleteFromDisk(path); |
509 #elif !defined(OS_CHROMEOS) | 508 #elif !defined(OS_CHROMEOS) |
510 // CRLSetFetcher attempts to load a CRL set from either the local disk or | 509 // CRLSetFetcher attempts to load a CRL set from either the local disk or |
511 // network. | 510 // network. |
512 // For Chrome OS this registration is delayed until user login. | 511 // For Chrome OS this registration is delayed until user login. |
513 g_browser_process->crl_set_fetcher()->StartInitialLoad(cus, path); | 512 g_browser_process->crl_set_fetcher()->StartInitialLoad(cus, path); |
514 // Registration of the EV Whitelist component here is not necessary for: | |
515 // 1. Android: Because it currently does not have the EV indicator. | |
516 // 2. Chrome OS: On Chrome OS this registration is delayed until user login. | |
517 RegisterEVWhitelistComponent(cus, path); | |
518 | 513 |
519 // Registration of the STH set fetcher here is not done for: | 514 // Registration of the STH set fetcher here is not done for: |
520 // Android: Because the story around CT on Mobile is not finalized yet. | 515 // Android: Because the story around CT on Mobile is not finalized yet. |
521 // Chrome OS: On Chrome OS this registration is delayed until user login. | 516 // Chrome OS: On Chrome OS this registration is delayed until user login. |
522 RegisterSTHSetComponent(cus, path); | 517 RegisterSTHSetComponent(cus, path); |
523 #endif // defined(OS_ANDROID) | 518 #endif // defined(OS_ANDROID) |
524 RegisterOriginTrialsComponent(cus, path); | 519 RegisterOriginTrialsComponent(cus, path); |
525 | 520 |
526 RegisterFileTypePoliciesComponent(cus, path); | 521 RegisterFileTypePoliciesComponent(cus, path); |
527 | 522 |
(...skipping 1535 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2063 chromeos::CrosSettings::Shutdown(); | 2058 chromeos::CrosSettings::Shutdown(); |
2064 #endif // defined(OS_CHROMEOS) | 2059 #endif // defined(OS_CHROMEOS) |
2065 #endif // defined(OS_ANDROID) | 2060 #endif // defined(OS_ANDROID) |
2066 } | 2061 } |
2067 | 2062 |
2068 // Public members: | 2063 // Public members: |
2069 | 2064 |
2070 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 2065 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
2071 chrome_extra_parts_.push_back(parts); | 2066 chrome_extra_parts_.push_back(parts); |
2072 } | 2067 } |
OLD | NEW |