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

Unified Diff: chrome/renderer/chrome_content_renderer_client.cc

Issue 23452025: Move EME key system knowledge from content/ to chrome/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review feedback and disabled mosts tests in encrypted_media_browsertest.cc Created 7 years, 3 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
Index: chrome/renderer/chrome_content_renderer_client.cc
diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc
index afbc1aefc71f9e1e4678cf2d7d9ba12a19f3ee42..cddfb9e43894324522d563d6ef501572021ac42b 100644
--- a/chrome/renderer/chrome_content_renderer_client.cc
+++ b/chrome/renderer/chrome_content_renderer_client.cc
@@ -40,6 +40,7 @@
#include "chrome/renderer/extensions/resource_request_policy.h"
#include "chrome/renderer/external_extension.h"
#include "chrome/renderer/loadtimes_extension_bindings.h"
+#include "chrome/renderer/media/chrome_key_systems.h"
#include "chrome/renderer/net/net_error_helper.h"
#include "chrome/renderer/net/prescient_networking_dispatcher.h"
#include "chrome/renderer/net/renderer_net_predictor.h"
@@ -1302,9 +1303,7 @@ bool ChromeContentRendererClient::AllowPepperMediaStreamAPI(
void ChromeContentRendererClient::AddKeySystems(
std::vector<content::KeySystemInfo>* key_systems) {
- // TODO(ddorwin): In the next CL, move code from
- // content/renderer/media/crypto/key_systems_info.cc to chrome_key_systems.cc
- // and call AddKeySystems.
+ AddChromeKeySystems(key_systems);
}
bool ChromeContentRendererClient::ShouldReportDetailedMessageForSource(

Powered by Google App Engine
This is Rietveld 408576698