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

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

Issue 2765343003: media: Add MediaDrmStorage (Closed)
Patch Set: comments addressed 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
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 2724 matching lines...) Expand 10 before | Expand all | Expand 10 after
3123 // TODO(xhwang): Only register this when ENABLE_MOJO_MEDIA. 3126 // TODO(xhwang): Only register this when ENABLE_MOJO_MEDIA.
3124 #if defined(OS_CHROMEOS) 3127 #if defined(OS_CHROMEOS)
3125 registry->AddInterface( 3128 registry->AddInterface(
3126 base::Bind(&chromeos::attestation::PlatformVerificationImpl::Create, 3129 base::Bind(&chromeos::attestation::PlatformVerificationImpl::Create,
3127 render_frame_host)); 3130 render_frame_host));
3128 #endif // defined(OS_CHROMEOS) 3131 #endif // defined(OS_CHROMEOS)
3129 3132
3130 #if defined(ENABLE_MOJO_MEDIA) 3133 #if defined(ENABLE_MOJO_MEDIA)
3131 registry->AddInterface( 3134 registry->AddInterface(
3132 base::Bind(&OutputProtectionImpl::Create, render_frame_host)); 3135 base::Bind(&OutputProtectionImpl::Create, render_frame_host));
3136 #if defined(ENABLE_MOJO_CDM) && defined(OS_ANDROID)
3137 registry->AddInterface(
3138 base::Bind(&chrome::CreateMediaDrmStorage, render_frame_host));
3139 #endif
3133 #endif // defined(ENABLE_MOJO_MEDIA) 3140 #endif // defined(ENABLE_MOJO_MEDIA)
3134 } 3141 }
3135 3142
3136 void ChromeContentBrowserClient::RegisterRenderFrameMojoInterfaces( 3143 void ChromeContentBrowserClient::RegisterRenderFrameMojoInterfaces(
3137 service_manager::InterfaceRegistry* registry, 3144 service_manager::InterfaceRegistry* registry,
3138 content::RenderFrameHost* render_frame_host) { 3145 content::RenderFrameHost* render_frame_host) {
3139 if (base::FeatureList::IsEnabled(features::kWebUsb) 3146 if (base::FeatureList::IsEnabled(features::kWebUsb)
3140 #if BUILDFLAG(ENABLE_EXTENSIONS) 3147 #if BUILDFLAG(ENABLE_EXTENSIONS)
3141 && 3148 &&
3142 !render_frame_host->GetSiteInstance()->GetSiteURL().SchemeIs( 3149 !render_frame_host->GetSiteInstance()->GetSiteURL().SchemeIs(
(...skipping 447 matching lines...) Expand 10 before | Expand all | Expand 10 after
3590 RedirectNonUINonIOBrowserThreadsToTaskScheduler() { 3597 RedirectNonUINonIOBrowserThreadsToTaskScheduler() {
3591 return variations::GetVariationParamValue( 3598 return variations::GetVariationParamValue(
3592 "BrowserScheduler", "RedirectNonUINonIOBrowserThreads") == "true"; 3599 "BrowserScheduler", "RedirectNonUINonIOBrowserThreads") == "true";
3593 } 3600 }
3594 3601
3595 // static 3602 // static
3596 void ChromeContentBrowserClient::SetDefaultQuotaSettingsForTesting( 3603 void ChromeContentBrowserClient::SetDefaultQuotaSettingsForTesting(
3597 const storage::QuotaSettings* settings) { 3604 const storage::QuotaSettings* settings) {
3598 g_default_quota_settings = settings; 3605 g_default_quota_settings = settings;
3599 } 3606 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698