| 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_content_browser_client.h" | 5 #include "chrome/browser/chrome_content_browser_client.h" |
| 6 | 6 |
| 7 #include <map> | 7 #include <map> |
| 8 #include <set> | 8 #include <set> |
| 9 #include <utility> | 9 #include <utility> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 355 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 366 #if defined(ENABLE_MEDIA_ROUTER) | 366 #if defined(ENABLE_MEDIA_ROUTER) |
| 367 #include "chrome/browser/media/router/media_router_feature.h" | 367 #include "chrome/browser/media/router/media_router_feature.h" |
| 368 #include "chrome/browser/media/router/presentation_service_delegate_impl.h" | 368 #include "chrome/browser/media/router/presentation_service_delegate_impl.h" |
| 369 #include "chrome/browser/media/router/receiver_presentation_service_delegate_imp
l.h" | 369 #include "chrome/browser/media/router/receiver_presentation_service_delegate_imp
l.h" |
| 370 #endif // defined(ENABLE_MEDIA_ROUTER) | 370 #endif // defined(ENABLE_MEDIA_ROUTER) |
| 371 | 371 |
| 372 #if BUILDFLAG(ENABLE_MEDIA_REMOTING) && defined(ENABLE_MEDIA_ROUTER) | 372 #if BUILDFLAG(ENABLE_MEDIA_REMOTING) && defined(ENABLE_MEDIA_ROUTER) |
| 373 #include "chrome/browser/media/cast_remoting_connector.h" | 373 #include "chrome/browser/media/cast_remoting_connector.h" |
| 374 #endif | 374 #endif |
| 375 | 375 |
| 376 | |
| 377 #if defined(ENABLE_WAYLAND_SERVER) | 376 #if defined(ENABLE_WAYLAND_SERVER) |
| 378 #include "chrome/browser/chrome_browser_main_extra_parts_exo.h" | 377 #include "chrome/browser/chrome_browser_main_extra_parts_exo.h" |
| 379 #endif | 378 #endif |
| 380 | 379 |
| 381 #if defined(ENABLE_MOJO_MEDIA) | 380 #if defined(ENABLE_MOJO_MEDIA) |
| 382 #include "chrome/browser/media/output_protection_impl.h" | 381 #include "chrome/browser/media/output_protection_impl.h" |
| 382 #if defined(ENABLE_MOJO_CDM) && defined(OS_ANDROID) |
| 383 #include "chrome/browser/media/android/cdm/media_drm_storage_impl.h" |
| 384 #endif |
| 383 #endif | 385 #endif |
| 384 | 386 |
| 385 #if defined(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS) | 387 #if defined(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS) |
| 386 #include "media/mojo/services/media_service_factory.h" // nogncheck | 388 #include "media/mojo/services/media_service_factory.h" // nogncheck |
| 387 #endif | 389 #endif |
| 388 | 390 |
| 389 #if defined(OS_CHROMEOS) | 391 #if defined(OS_CHROMEOS) |
| 390 #include "chrome/browser/metrics/leak_detector/leak_detector_remote_controller.h
" | 392 #include "chrome/browser/metrics/leak_detector/leak_detector_remote_controller.h
" |
| 391 #endif | 393 #endif |
| 392 | 394 |
| (...skipping 2718 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3111 // TODO(xhwang): Only register this when ENABLE_MOJO_MEDIA. | 3113 // TODO(xhwang): Only register this when ENABLE_MOJO_MEDIA. |
| 3112 #if defined(OS_CHROMEOS) | 3114 #if defined(OS_CHROMEOS) |
| 3113 registry->AddInterface( | 3115 registry->AddInterface( |
| 3114 base::Bind(&chromeos::attestation::PlatformVerificationImpl::Create, | 3116 base::Bind(&chromeos::attestation::PlatformVerificationImpl::Create, |
| 3115 render_frame_host)); | 3117 render_frame_host)); |
| 3116 #endif // defined(OS_CHROMEOS) | 3118 #endif // defined(OS_CHROMEOS) |
| 3117 | 3119 |
| 3118 #if defined(ENABLE_MOJO_MEDIA) | 3120 #if defined(ENABLE_MOJO_MEDIA) |
| 3119 registry->AddInterface( | 3121 registry->AddInterface( |
| 3120 base::Bind(&OutputProtectionImpl::Create, render_frame_host)); | 3122 base::Bind(&OutputProtectionImpl::Create, render_frame_host)); |
| 3123 |
| 3124 #if defined(ENABLE_MOJO_CDM) && defined(OS_ANDROID) |
| 3125 registry->AddInterface( |
| 3126 base::Bind(&chrome::MediaDrmStorageImpl::Create, render_frame_host)); |
| 3127 #endif |
| 3121 #endif // defined(ENABLE_MOJO_MEDIA) | 3128 #endif // defined(ENABLE_MOJO_MEDIA) |
| 3122 } | 3129 } |
| 3123 | 3130 |
| 3124 void ChromeContentBrowserClient::RegisterRenderFrameMojoInterfaces( | 3131 void ChromeContentBrowserClient::RegisterRenderFrameMojoInterfaces( |
| 3125 service_manager::InterfaceRegistry* registry, | 3132 service_manager::InterfaceRegistry* registry, |
| 3126 content::RenderFrameHost* render_frame_host) { | 3133 content::RenderFrameHost* render_frame_host) { |
| 3127 if (base::FeatureList::IsEnabled(features::kWebUsb) | 3134 if (base::FeatureList::IsEnabled(features::kWebUsb) |
| 3128 #if BUILDFLAG(ENABLE_EXTENSIONS) | 3135 #if BUILDFLAG(ENABLE_EXTENSIONS) |
| 3129 && | 3136 && |
| 3130 !render_frame_host->GetSiteInstance()->GetSiteURL().SchemeIs( | 3137 !render_frame_host->GetSiteInstance()->GetSiteURL().SchemeIs( |
| (...skipping 421 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3552 RedirectNonUINonIOBrowserThreadsToTaskScheduler() { | 3559 RedirectNonUINonIOBrowserThreadsToTaskScheduler() { |
| 3553 return variations::GetVariationParamValue( | 3560 return variations::GetVariationParamValue( |
| 3554 "BrowserScheduler", "RedirectNonUINonIOBrowserThreads") == "true"; | 3561 "BrowserScheduler", "RedirectNonUINonIOBrowserThreads") == "true"; |
| 3555 } | 3562 } |
| 3556 | 3563 |
| 3557 // static | 3564 // static |
| 3558 void ChromeContentBrowserClient::SetDefaultQuotaSettingsForTesting( | 3565 void ChromeContentBrowserClient::SetDefaultQuotaSettingsForTesting( |
| 3559 const storage::QuotaSettings* settings) { | 3566 const storage::QuotaSettings* settings) { |
| 3560 g_default_quota_settings = settings; | 3567 g_default_quota_settings = settings; |
| 3561 } | 3568 } |
| OLD | NEW |