| 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 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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/recovery_improved_component_installer
.h" | 56 #include "chrome/browser/component_updater/recovery_improved_component_installer
.h" |
| 57 #include "chrome/browser/component_updater/sth_set_component_installer.h" | 57 #include "chrome/browser/component_updater/sth_set_component_installer.h" |
| 58 #include "chrome/browser/component_updater/subresource_filter_component_installe
r.h" | 58 #include "chrome/browser/component_updater/subresource_filter_component_installe
r.h" |
| 59 #include "chrome/browser/component_updater/supervised_user_whitelist_installer.h
" | 59 #include "chrome/browser/component_updater/supervised_user_whitelist_installer.h
" |
| 60 #include "chrome/browser/component_updater/swiftshader_component_installer.h" | |
| 61 #include "chrome/browser/component_updater/widevine_cdm_component_installer.h" | 60 #include "chrome/browser/component_updater/widevine_cdm_component_installer.h" |
| 62 #include "chrome/browser/defaults.h" | 61 #include "chrome/browser/defaults.h" |
| 63 #include "chrome/browser/first_run/first_run.h" | 62 #include "chrome/browser/first_run/first_run.h" |
| 64 #include "chrome/browser/geolocation/chrome_access_token_store.h" | 63 #include "chrome/browser/geolocation/chrome_access_token_store.h" |
| 65 #include "chrome/browser/gpu/gpu_profile_cache.h" | 64 #include "chrome/browser/gpu/gpu_profile_cache.h" |
| 66 #include "chrome/browser/gpu/three_d_api_observer.h" | 65 #include "chrome/browser/gpu/three_d_api_observer.h" |
| 67 #include "chrome/browser/media/webrtc/media_capture_devices_dispatcher.h" | 66 #include "chrome/browser/media/webrtc/media_capture_devices_dispatcher.h" |
| 68 #include "chrome/browser/memory/tab_manager.h" | 67 #include "chrome/browser/memory/tab_manager.h" |
| 69 #include "chrome/browser/metrics/chrome_metrics_service_accessor.h" | 68 #include "chrome/browser/metrics/chrome_metrics_service_accessor.h" |
| 70 #include "chrome/browser/metrics/field_trial_synchronizer.h" | 69 #include "chrome/browser/metrics/field_trial_synchronizer.h" |
| (...skipping 400 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 471 auto* const cus = g_browser_process->component_updater(); | 470 auto* const cus = g_browser_process->component_updater(); |
| 472 | 471 |
| 473 if (base::FeatureList::IsEnabled(features::kImprovedRecoveryComponent)) | 472 if (base::FeatureList::IsEnabled(features::kImprovedRecoveryComponent)) |
| 474 RegisterRecoveryImprovedComponent(cus, g_browser_process->local_state()); | 473 RegisterRecoveryImprovedComponent(cus, g_browser_process->local_state()); |
| 475 else | 474 else |
| 476 RegisterRecoveryComponent(cus, g_browser_process->local_state()); | 475 RegisterRecoveryComponent(cus, g_browser_process->local_state()); |
| 477 | 476 |
| 478 #if !defined(OS_ANDROID) | 477 #if !defined(OS_ANDROID) |
| 479 RegisterPepperFlashComponent(cus); | 478 RegisterPepperFlashComponent(cus); |
| 480 #if !defined(OS_CHROMEOS) | 479 #if !defined(OS_CHROMEOS) |
| 481 RegisterSwiftShaderComponent(cus); | |
| 482 RegisterWidevineCdmComponent(cus); | 480 RegisterWidevineCdmComponent(cus); |
| 483 #endif // !defined(OS_CHROMEOS) | 481 #endif // !defined(OS_CHROMEOS) |
| 484 #endif // !defined(OS_ANDROID) | 482 #endif // !defined(OS_ANDROID) |
| 485 | 483 |
| 486 #if !defined(DISABLE_NACL) && !defined(OS_ANDROID) | 484 #if !defined(DISABLE_NACL) && !defined(OS_ANDROID) |
| 487 #if defined(OS_CHROMEOS) | 485 #if defined(OS_CHROMEOS) |
| 488 // PNaCl on Chrome OS is on rootfs and there is no need to download it. But | 486 // PNaCl on Chrome OS is on rootfs and there is no need to download it. But |
| 489 // Chrome4ChromeOS on Linux doesn't contain PNaCl so enable component | 487 // Chrome4ChromeOS on Linux doesn't contain PNaCl so enable component |
| 490 // installer when running on Linux. See crbug.com/422121 for more details. | 488 // installer when running on Linux. See crbug.com/422121 for more details. |
| 491 if (!base::SysInfo::IsRunningOnChromeOS()) | 489 if (!base::SysInfo::IsRunningOnChromeOS()) |
| (...skipping 1596 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2088 chromeos::CrosSettings::Shutdown(); | 2086 chromeos::CrosSettings::Shutdown(); |
| 2089 #endif // defined(OS_CHROMEOS) | 2087 #endif // defined(OS_CHROMEOS) |
| 2090 #endif // defined(OS_ANDROID) | 2088 #endif // defined(OS_ANDROID) |
| 2091 } | 2089 } |
| 2092 | 2090 |
| 2093 // Public members: | 2091 // Public members: |
| 2094 | 2092 |
| 2095 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 2093 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
| 2096 chrome_extra_parts_.push_back(parts); | 2094 chrome_extra_parts_.push_back(parts); |
| 2097 } | 2095 } |
| OLD | NEW |