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 403 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
474 auto* const cus = g_browser_process->component_updater(); | 473 auto* const cus = g_browser_process->component_updater(); |
475 | 474 |
476 if (base::FeatureList::IsEnabled(features::kImprovedRecoveryComponent)) | 475 if (base::FeatureList::IsEnabled(features::kImprovedRecoveryComponent)) |
477 RegisterRecoveryImprovedComponent(cus, g_browser_process->local_state()); | 476 RegisterRecoveryImprovedComponent(cus, g_browser_process->local_state()); |
478 else | 477 else |
479 RegisterRecoveryComponent(cus, g_browser_process->local_state()); | 478 RegisterRecoveryComponent(cus, g_browser_process->local_state()); |
480 | 479 |
481 #if !defined(OS_ANDROID) | 480 #if !defined(OS_ANDROID) |
482 RegisterPepperFlashComponent(cus); | 481 RegisterPepperFlashComponent(cus); |
483 #if !defined(OS_CHROMEOS) | 482 #if !defined(OS_CHROMEOS) |
484 RegisterSwiftShaderComponent(cus); | |
485 RegisterWidevineCdmComponent(cus); | 483 RegisterWidevineCdmComponent(cus); |
486 #endif // !defined(OS_CHROMEOS) | 484 #endif // !defined(OS_CHROMEOS) |
487 #endif // !defined(OS_ANDROID) | 485 #endif // !defined(OS_ANDROID) |
488 | 486 |
489 #if !defined(DISABLE_NACL) && !defined(OS_ANDROID) | 487 #if !defined(DISABLE_NACL) && !defined(OS_ANDROID) |
490 #if defined(OS_CHROMEOS) | 488 #if defined(OS_CHROMEOS) |
491 // PNaCl on Chrome OS is on rootfs and there is no need to download it. But | 489 // PNaCl on Chrome OS is on rootfs and there is no need to download it. But |
492 // Chrome4ChromeOS on Linux doesn't contain PNaCl so enable component | 490 // Chrome4ChromeOS on Linux doesn't contain PNaCl so enable component |
493 // installer when running on Linux. See crbug.com/422121 for more details. | 491 // installer when running on Linux. See crbug.com/422121 for more details. |
494 if (!base::SysInfo::IsRunningOnChromeOS()) | 492 if (!base::SysInfo::IsRunningOnChromeOS()) |
(...skipping 1618 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2113 chromeos::CrosSettings::Shutdown(); | 2111 chromeos::CrosSettings::Shutdown(); |
2114 #endif // defined(OS_CHROMEOS) | 2112 #endif // defined(OS_CHROMEOS) |
2115 #endif // defined(OS_ANDROID) | 2113 #endif // defined(OS_ANDROID) |
2116 } | 2114 } |
2117 | 2115 |
2118 // Public members: | 2116 // Public members: |
2119 | 2117 |
2120 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 2118 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
2121 chrome_extra_parts_.push_back(parts); | 2119 chrome_extra_parts_.push_back(parts); |
2122 } | 2120 } |
OLD | NEW |