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

Unified Diff: webkit/media/crypto/key_systems.cc

Issue 15028015: Conditionally build support for Pepper-based CDMs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Use AppendAscii() where possible. Created 7 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 | « webkit/media/crypto/key_systems.h ('k') | webkit/media/crypto/key_systems_info.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/media/crypto/key_systems.cc
diff --git a/webkit/media/crypto/key_systems.cc b/webkit/media/crypto/key_systems.cc
index 0ffe95198592fc5cad7d852657c4a8c2212fbe36..04501649651feffe2ac5c8167b243c280f014ccd 100644
--- a/webkit/media/crypto/key_systems.cc
+++ b/webkit/media/crypto/key_systems.cc
@@ -149,13 +149,15 @@ bool CanUseAesDecryptor(const std::string& key_system) {
return CanUseBuiltInAesDecryptor(key_system);
}
-std::string GetPluginType(const std::string& key_system) {
- for (int i = 0; i < kNumKeySystemToPluginTypeMapping; ++i) {
- if (kKeySystemToPluginTypeMapping[i].key_system == key_system)
- return kKeySystemToPluginTypeMapping[i].plugin_type;
+#if defined(ENABLE_PEPPER_CDMS)
+std::string GetPepperType(const std::string& key_system) {
+ for (int i = 0; i < kNumKeySystemToPepperTypeMapping; ++i) {
+ if (kKeySystemToPepperTypeMapping[i].key_system == key_system)
+ return kKeySystemToPepperTypeMapping[i].type;
}
return std::string();
}
+#endif // defined(ENABLE_PEPPER_CDMS)
} // namespace webkit_media
« no previous file with comments | « webkit/media/crypto/key_systems.h ('k') | webkit/media/crypto/key_systems_info.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698