| 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 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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" | 55 #include "chrome/browser/component_updater/ev_whitelist_component_installer.h" |
| 56 #include "chrome/browser/component_updater/file_type_policies_component_installe
r.h" | 56 #include "chrome/browser/component_updater/file_type_policies_component_installe
r.h" |
| 57 #include "chrome/browser/component_updater/origin_trials_component_installer.h" | 57 #include "chrome/browser/component_updater/origin_trials_component_installer.h" |
| 58 #include "chrome/browser/component_updater/pepper_flash_component_installer.h" | 58 #include "chrome/browser/component_updater/pepper_flash_component_installer.h" |
| 59 #include "chrome/browser/component_updater/recovery_component_installer.h" | 59 #include "chrome/browser/component_updater/recovery_component_installer.h" |
| 60 #include "chrome/browser/component_updater/recovery_improved_component_installer
.h" | 60 #include "chrome/browser/component_updater/recovery_improved_component_installer
.h" |
| 61 #include "chrome/browser/component_updater/sth_set_component_installer.h" | 61 #include "chrome/browser/component_updater/sth_set_component_installer.h" |
| 62 #include "chrome/browser/component_updater/subresource_filter_component_installe
r.h" | 62 #include "chrome/browser/component_updater/subresource_filter_component_installe
r.h" |
| 63 #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" |
| 66 #include "chrome/browser/experiments/memory_ablation_experiment.h" | 65 #include "chrome/browser/experiments/memory_ablation_experiment.h" |
| 67 #include "chrome/browser/first_run/first_run.h" | 66 #include "chrome/browser/first_run/first_run.h" |
| 68 #include "chrome/browser/geolocation/chrome_access_token_store.h" | 67 #include "chrome/browser/geolocation/chrome_access_token_store.h" |
| 69 #include "chrome/browser/gpu/gpu_profile_cache.h" | 68 #include "chrome/browser/gpu/gpu_profile_cache.h" |
| 70 #include "chrome/browser/gpu/three_d_api_observer.h" | 69 #include "chrome/browser/gpu/three_d_api_observer.h" |
| 71 #include "chrome/browser/media/webrtc/media_capture_devices_dispatcher.h" | 70 #include "chrome/browser/media/webrtc/media_capture_devices_dispatcher.h" |
| 72 #include "chrome/browser/metrics/chrome_metrics_service_accessor.h" | 71 #include "chrome/browser/metrics/chrome_metrics_service_accessor.h" |
| 73 #include "chrome/browser/metrics/field_trial_synchronizer.h" | 72 #include "chrome/browser/metrics/field_trial_synchronizer.h" |
| (...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 250 | 249 |
| 251 #if BUILDFLAG(ENABLE_PRINT_PREVIEW) && !defined(OFFICIAL_BUILD) | 250 #if BUILDFLAG(ENABLE_PRINT_PREVIEW) && !defined(OFFICIAL_BUILD) |
| 252 #include "printing/printed_document.h" | 251 #include "printing/printed_document.h" |
| 253 #endif // BUILDFLAG(ENABLE_PRINT_PREVIEW) && !defined(OFFICIAL_BUILD) | 252 #endif // BUILDFLAG(ENABLE_PRINT_PREVIEW) && !defined(OFFICIAL_BUILD) |
| 254 | 253 |
| 255 #if BUILDFLAG(ENABLE_RLZ) | 254 #if BUILDFLAG(ENABLE_RLZ) |
| 256 #include "chrome/browser/rlz/chrome_rlz_tracker_delegate.h" | 255 #include "chrome/browser/rlz/chrome_rlz_tracker_delegate.h" |
| 257 #include "components/rlz/rlz_tracker.h" | 256 #include "components/rlz/rlz_tracker.h" |
| 258 #endif // BUILDFLAG(ENABLE_RLZ) | 257 #endif // BUILDFLAG(ENABLE_RLZ) |
| 259 | 258 |
| 259 #if BUILDFLAG(ENABLE_SUPERVISED_USERS) |
| 260 #include "chrome/browser/component_updater/supervised_user_whitelist_installer.h
" |
| 261 #endif |
| 262 |
| 260 #if BUILDFLAG(ENABLE_WEBRTC) | 263 #if BUILDFLAG(ENABLE_WEBRTC) |
| 261 #include "chrome/browser/media/webrtc/webrtc_log_util.h" | 264 #include "chrome/browser/media/webrtc/webrtc_log_util.h" |
| 262 #endif // BUILDFLAG(ENABLE_WEBRTC) | 265 #endif // BUILDFLAG(ENABLE_WEBRTC) |
| 263 | 266 |
| 264 #if defined(USE_AURA) | 267 #if defined(USE_AURA) |
| 265 #include "ui/aura/env.h" | 268 #include "ui/aura/env.h" |
| 266 #endif // defined(USE_AURA) | 269 #endif // defined(USE_AURA) |
| 267 | 270 |
| 268 #if !defined(OS_ANDROID) | 271 #if !defined(OS_ANDROID) |
| 269 #include "chrome/browser/usb/web_usb_detector.h" | 272 #include "chrome/browser/usb/web_usb_detector.h" |
| (...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 487 #if !defined(DISABLE_NACL) && !defined(OS_ANDROID) | 490 #if !defined(DISABLE_NACL) && !defined(OS_ANDROID) |
| 488 #if defined(OS_CHROMEOS) | 491 #if defined(OS_CHROMEOS) |
| 489 // PNaCl on Chrome OS is on rootfs and there is no need to download it. But | 492 // PNaCl on Chrome OS is on rootfs and there is no need to download it. But |
| 490 // Chrome4ChromeOS on Linux doesn't contain PNaCl so enable component | 493 // Chrome4ChromeOS on Linux doesn't contain PNaCl so enable component |
| 491 // installer when running on Linux. See crbug.com/422121 for more details. | 494 // installer when running on Linux. See crbug.com/422121 for more details. |
| 492 if (!base::SysInfo::IsRunningOnChromeOS()) | 495 if (!base::SysInfo::IsRunningOnChromeOS()) |
| 493 #endif // defined(OS_CHROMEOS) | 496 #endif // defined(OS_CHROMEOS) |
| 494 g_browser_process->pnacl_component_installer()->RegisterPnaclComponent(cus); | 497 g_browser_process->pnacl_component_installer()->RegisterPnaclComponent(cus); |
| 495 #endif // !defined(DISABLE_NACL) && !defined(OS_ANDROID) | 498 #endif // !defined(DISABLE_NACL) && !defined(OS_ANDROID) |
| 496 | 499 |
| 500 #if BUILDFLAG(ENABLE_SUPERVISED_USERS) |
| 497 component_updater::SupervisedUserWhitelistInstaller* whitelist_installer = | 501 component_updater::SupervisedUserWhitelistInstaller* whitelist_installer = |
| 498 g_browser_process->supervised_user_whitelist_installer(); | 502 g_browser_process->supervised_user_whitelist_installer(); |
| 499 whitelist_installer->RegisterComponents(); | 503 whitelist_installer->RegisterComponents(); |
| 504 #endif |
| 500 | 505 |
| 501 RegisterSubresourceFilterComponent(cus); | 506 RegisterSubresourceFilterComponent(cus); |
| 502 | 507 |
| 503 base::FilePath path; | 508 base::FilePath path; |
| 504 if (PathService::Get(chrome::DIR_USER_DATA, &path)) { | 509 if (PathService::Get(chrome::DIR_USER_DATA, &path)) { |
| 505 #if defined(OS_ANDROID) | 510 #if defined(OS_ANDROID) |
| 506 // The CRLSet component was enabled for some releases. This code attempts to | 511 // 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. | 512 // delete it from the local disk of those how may have downloaded it. |
| 508 g_browser_process->crl_set_fetcher()->DeleteFromDisk(path); | 513 g_browser_process->crl_set_fetcher()->DeleteFromDisk(path); |
| 509 #elif !defined(OS_CHROMEOS) | 514 #elif !defined(OS_CHROMEOS) |
| (...skipping 1553 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2063 chromeos::CrosSettings::Shutdown(); | 2068 chromeos::CrosSettings::Shutdown(); |
| 2064 #endif // defined(OS_CHROMEOS) | 2069 #endif // defined(OS_CHROMEOS) |
| 2065 #endif // defined(OS_ANDROID) | 2070 #endif // defined(OS_ANDROID) |
| 2066 } | 2071 } |
| 2067 | 2072 |
| 2068 // Public members: | 2073 // Public members: |
| 2069 | 2074 |
| 2070 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 2075 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
| 2071 chrome_extra_parts_.push_back(parts); | 2076 chrome_extra_parts_.push_back(parts); |
| 2072 } | 2077 } |
| OLD | NEW |