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

Unified Diff: media/blink/webencryptedmediaclient_impl.cc

Issue 912233004: Explicitly differentiate key system support functions by EME version. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years, 10 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 | « media/blink/webcontentdecryptionmodule_impl.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/blink/webencryptedmediaclient_impl.cc
diff --git a/media/blink/webencryptedmediaclient_impl.cc b/media/blink/webencryptedmediaclient_impl.cc
index 462a3e830105b17981a6021aabf76271e0c447ba..53b658330e72ac3a15687c375ee701800e0670da 100644
--- a/media/blink/webencryptedmediaclient_impl.cc
+++ b/media/blink/webencryptedmediaclient_impl.cc
@@ -10,13 +10,13 @@
#include "base/strings/utf_string_conversions.h"
#include "media/base/key_systems.h"
#include "media/base/media_permission.h"
+#include "media/blink/webcontentdecryptionmodule_impl.h"
+#include "media/blink/webcontentdecryptionmoduleaccess_impl.h"
#include "net/base/mime_util.h"
#include "third_party/WebKit/public/platform/WebEncryptedMediaRequest.h"
#include "third_party/WebKit/public/platform/WebMediaKeySystemConfiguration.h"
#include "third_party/WebKit/public/platform/WebString.h"
#include "third_party/WebKit/public/platform/WebVector.h"
-#include "webcontentdecryptionmodule_impl.h"
-#include "webcontentdecryptionmoduleaccess_impl.h"
namespace media {
@@ -226,7 +226,7 @@ void WebEncryptedMediaClientImpl::requestMediaKeySystemAccess(
Reporter* reporter = GetReporter(key_system);
reporter->ReportRequested();
- if (!IsConcreteSupportedKeySystem(key_system)) {
+ if (!IsSupportedKeySystem(key_system)) {
request.requestNotSupported("Unsupported keySystem");
return;
}
« no previous file with comments | « media/blink/webcontentdecryptionmodule_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698