| 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 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 46 #include "chrome/browser/browser_process.h" | 46 #include "chrome/browser/browser_process.h" |
| 47 #include "chrome/browser/browser_process_impl.h" | 47 #include "chrome/browser/browser_process_impl.h" |
| 48 #include "chrome/browser/browser_process_platform_part.h" | 48 #include "chrome/browser/browser_process_platform_part.h" |
| 49 #include "chrome/browser/browser_shutdown.h" | 49 #include "chrome/browser/browser_shutdown.h" |
| 50 #include "chrome/browser/chrome_browser_main_extra_parts.h" | 50 #include "chrome/browser/chrome_browser_main_extra_parts.h" |
| 51 #include "chrome/browser/component_updater/ev_whitelist_component_installer.h" | 51 #include "chrome/browser/component_updater/ev_whitelist_component_installer.h" |
| 52 #include "chrome/browser/component_updater/file_type_policies_component_installe
r.h" | 52 #include "chrome/browser/component_updater/file_type_policies_component_installe
r.h" |
| 53 #include "chrome/browser/component_updater/origin_trials_component_installer.h" | 53 #include "chrome/browser/component_updater/origin_trials_component_installer.h" |
| 54 #include "chrome/browser/component_updater/pepper_flash_component_installer.h" | 54 #include "chrome/browser/component_updater/pepper_flash_component_installer.h" |
| 55 #include "chrome/browser/component_updater/recovery_component_installer.h" | 55 #include "chrome/browser/component_updater/recovery_component_installer.h" |
| 56 #include "chrome/browser/component_updater/ssl_error_assistant_component_install
er.h" |
| 56 #include "chrome/browser/component_updater/sth_set_component_installer.h" | 57 #include "chrome/browser/component_updater/sth_set_component_installer.h" |
| 57 #include "chrome/browser/component_updater/subresource_filter_component_installe
r.h" | 58 #include "chrome/browser/component_updater/subresource_filter_component_installe
r.h" |
| 58 #include "chrome/browser/component_updater/supervised_user_whitelist_installer.h
" | 59 #include "chrome/browser/component_updater/supervised_user_whitelist_installer.h
" |
| 59 #include "chrome/browser/component_updater/swiftshader_component_installer.h" | 60 #include "chrome/browser/component_updater/swiftshader_component_installer.h" |
| 60 #include "chrome/browser/component_updater/widevine_cdm_component_installer.h" | 61 #include "chrome/browser/component_updater/widevine_cdm_component_installer.h" |
| 61 #include "chrome/browser/defaults.h" | 62 #include "chrome/browser/defaults.h" |
| 62 #include "chrome/browser/first_run/first_run.h" | 63 #include "chrome/browser/first_run/first_run.h" |
| 63 #include "chrome/browser/geolocation/chrome_access_token_store.h" | 64 #include "chrome/browser/geolocation/chrome_access_token_store.h" |
| 64 #include "chrome/browser/gpu/gpu_profile_cache.h" | 65 #include "chrome/browser/gpu/gpu_profile_cache.h" |
| 65 #include "chrome/browser/gpu/three_d_api_observer.h" | 66 #include "chrome/browser/gpu/three_d_api_observer.h" |
| (...skipping 451 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 517 RegisterEVWhitelistComponent(cus, path); | 518 RegisterEVWhitelistComponent(cus, path); |
| 518 | 519 |
| 519 // Registration of the STH set fetcher here is not done for: | 520 // Registration of the STH set fetcher here is not done for: |
| 520 // Android: Because the story around CT on Mobile is not finalized yet. | 521 // 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. | 522 // Chrome OS: On Chrome OS this registration is delayed until user login. |
| 522 RegisterSTHSetComponent(cus, path); | 523 RegisterSTHSetComponent(cus, path); |
| 523 #endif // defined(OS_ANDROID) | 524 #endif // defined(OS_ANDROID) |
| 524 RegisterOriginTrialsComponent(cus, path); | 525 RegisterOriginTrialsComponent(cus, path); |
| 525 | 526 |
| 526 RegisterFileTypePoliciesComponent(cus, path); | 527 RegisterFileTypePoliciesComponent(cus, path); |
| 528 |
| 529 RegisterSSLErrorAssistantComponent(cus, path); |
| 527 } | 530 } |
| 528 | 531 |
| 529 #if defined(OS_WIN) | 532 #if defined(OS_WIN) |
| 530 #if defined(GOOGLE_CHROME_BUILD) | 533 #if defined(GOOGLE_CHROME_BUILD) |
| 531 RegisterSwReporterComponent(cus); | 534 RegisterSwReporterComponent(cus); |
| 532 #endif // defined(GOOGLE_CHROME_BUILD) | 535 #endif // defined(GOOGLE_CHROME_BUILD) |
| 533 #endif // defined(OS_WIN) | 536 #endif // defined(OS_WIN) |
| 534 } | 537 } |
| 535 | 538 |
| 536 #if !defined(OS_ANDROID) | 539 #if !defined(OS_ANDROID) |
| (...skipping 1573 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2110 chromeos::CrosSettings::Shutdown(); | 2113 chromeos::CrosSettings::Shutdown(); |
| 2111 #endif // defined(OS_CHROMEOS) | 2114 #endif // defined(OS_CHROMEOS) |
| 2112 #endif // defined(OS_ANDROID) | 2115 #endif // defined(OS_ANDROID) |
| 2113 } | 2116 } |
| 2114 | 2117 |
| 2115 // Public members: | 2118 // Public members: |
| 2116 | 2119 |
| 2117 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 2120 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
| 2118 chrome_extra_parts_.push_back(parts); | 2121 chrome_extra_parts_.push_back(parts); |
| 2119 } | 2122 } |
| OLD | NEW |