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

Unified Diff: components/html_viewer/html_document.cc

Issue 1124863005: Restrict use of hardware-secure codecs based on the RendererPreference. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@setsecurity
Patch Set: Comment for base::Unretained(). Created 5 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | content/renderer/render_frame_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/html_viewer/html_document.cc
diff --git a/components/html_viewer/html_document.cc b/components/html_viewer/html_document.cc
index 227dae3280360905fbce1ceccaabcbc185e17b14..52fd058814e482c79abf9ec0bb401fe0e9393b77 100644
--- a/components/html_viewer/html_document.cc
+++ b/components/html_viewer/html_document.cc
@@ -328,7 +328,8 @@ void HTMLDocument::didNavigateWithinPage(
blink::WebEncryptedMediaClient* HTMLDocument::encryptedMediaClient() {
if (!web_encrypted_media_client_) {
web_encrypted_media_client_.reset(new media::WebEncryptedMediaClientImpl(
- GetCdmFactory(), GetMediaPermission()));
+ base::Bind(&AreSecureCodecsSupported), GetCdmFactory(),
+ GetMediaPermission()));
}
return web_encrypted_media_client_.get();
}
@@ -382,4 +383,9 @@ media::CdmFactory* HTMLDocument::GetCdmFactory() {
return cdm_factory_.get();
}
+bool AreSecureCodecsSupported() {
sky 2015/05/11 19:13:05 nit: move this into anonymous namespace at the top
sandersd (OOO until July 31) 2015/05/11 19:53:27 Done.
+ // Not currently supported by HTML Viewer.
+ return false;
+}
+
} // namespace html_viewer
« no previous file with comments | « no previous file | content/renderer/render_frame_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698