Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(104)

Side by Side Diff: chrome/browser/chrome_content_browser_client.cc

Issue 2765343003: media: Add MediaDrmStorage (Closed)
Patch Set: rebase only Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/browser/BUILD.gn ('k') | chrome/browser/media/android/cdm/media_drm_storage_factory.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 368 matching lines...) Expand 10 before | Expand all | Expand 10 after
379 #if BUILDFLAG(ENABLE_MEDIA_REMOTING) && defined(ENABLE_MEDIA_ROUTER) 379 #if BUILDFLAG(ENABLE_MEDIA_REMOTING) && defined(ENABLE_MEDIA_ROUTER)
380 #include "chrome/browser/media/cast_remoting_connector.h" 380 #include "chrome/browser/media/cast_remoting_connector.h"
381 #endif 381 #endif
382 382
383 #if BUILDFLAG(ENABLE_WAYLAND_SERVER) 383 #if BUILDFLAG(ENABLE_WAYLAND_SERVER)
384 #include "chrome/browser/chrome_browser_main_extra_parts_exo.h" 384 #include "chrome/browser/chrome_browser_main_extra_parts_exo.h"
385 #endif 385 #endif
386 386
387 #if defined(ENABLE_MOJO_MEDIA) 387 #if defined(ENABLE_MOJO_MEDIA)
388 #include "chrome/browser/media/output_protection_impl.h" 388 #include "chrome/browser/media/output_protection_impl.h"
389 #if defined(ENABLE_MOJO_CDM) && defined(OS_ANDROID)
390 #include "chrome/browser/media/android/cdm/media_drm_storage_factory.h"
391 #endif
389 #endif 392 #endif
390 393
391 #if defined(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS) 394 #if defined(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS)
392 #include "media/mojo/services/media_service_factory.h" // nogncheck 395 #include "media/mojo/services/media_service_factory.h" // nogncheck
393 #endif 396 #endif
394 397
395 #if defined(OS_CHROMEOS) 398 #if defined(OS_CHROMEOS)
396 #include "chrome/browser/metrics/leak_detector/leak_detector_remote_controller.h " 399 #include "chrome/browser/metrics/leak_detector/leak_detector_remote_controller.h "
397 #endif 400 #endif
398 401
(...skipping 2728 matching lines...) Expand 10 before | Expand all | Expand 10 after
3127 // TODO(xhwang): Only register this when ENABLE_MOJO_MEDIA. 3130 // TODO(xhwang): Only register this when ENABLE_MOJO_MEDIA.
3128 #if defined(OS_CHROMEOS) 3131 #if defined(OS_CHROMEOS)
3129 registry->AddInterface( 3132 registry->AddInterface(
3130 base::Bind(&chromeos::attestation::PlatformVerificationImpl::Create, 3133 base::Bind(&chromeos::attestation::PlatformVerificationImpl::Create,
3131 render_frame_host)); 3134 render_frame_host));
3132 #endif // defined(OS_CHROMEOS) 3135 #endif // defined(OS_CHROMEOS)
3133 3136
3134 #if defined(ENABLE_MOJO_MEDIA) 3137 #if defined(ENABLE_MOJO_MEDIA)
3135 registry->AddInterface( 3138 registry->AddInterface(
3136 base::Bind(&OutputProtectionImpl::Create, render_frame_host)); 3139 base::Bind(&OutputProtectionImpl::Create, render_frame_host));
3140 #if defined(ENABLE_MOJO_CDM) && defined(OS_ANDROID)
3141 registry->AddInterface(
3142 base::Bind(&chrome::CreateMediaDrmStorage, render_frame_host));
3143 #endif
3137 #endif // defined(ENABLE_MOJO_MEDIA) 3144 #endif // defined(ENABLE_MOJO_MEDIA)
3138 } 3145 }
3139 3146
3140 void ChromeContentBrowserClient::RegisterRenderFrameMojoInterfaces( 3147 void ChromeContentBrowserClient::RegisterRenderFrameMojoInterfaces(
3141 service_manager::InterfaceRegistry* registry, 3148 service_manager::InterfaceRegistry* registry,
3142 content::RenderFrameHost* render_frame_host) { 3149 content::RenderFrameHost* render_frame_host) {
3143 if (base::FeatureList::IsEnabled(features::kWebUsb) 3150 if (base::FeatureList::IsEnabled(features::kWebUsb)
3144 #if BUILDFLAG(ENABLE_EXTENSIONS) 3151 #if BUILDFLAG(ENABLE_EXTENSIONS)
3145 && 3152 &&
3146 !render_frame_host->GetSiteInstance()->GetSiteURL().SchemeIs( 3153 !render_frame_host->GetSiteInstance()->GetSiteURL().SchemeIs(
(...skipping 454 matching lines...) Expand 10 before | Expand all | Expand 10 after
3601 RedirectNonUINonIOBrowserThreadsToTaskScheduler() { 3608 RedirectNonUINonIOBrowserThreadsToTaskScheduler() {
3602 return variations::GetVariationParamValue( 3609 return variations::GetVariationParamValue(
3603 "BrowserScheduler", "RedirectNonUINonIOBrowserThreads") == "true"; 3610 "BrowserScheduler", "RedirectNonUINonIOBrowserThreads") == "true";
3604 } 3611 }
3605 3612
3606 // static 3613 // static
3607 void ChromeContentBrowserClient::SetDefaultQuotaSettingsForTesting( 3614 void ChromeContentBrowserClient::SetDefaultQuotaSettingsForTesting(
3608 const storage::QuotaSettings* settings) { 3615 const storage::QuotaSettings* settings) {
3609 g_default_quota_settings = settings; 3616 g_default_quota_settings = settings;
3610 } 3617 }
OLDNEW
« no previous file with comments | « chrome/browser/BUILD.gn ('k') | chrome/browser/media/android/cdm/media_drm_storage_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698