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 4a76b19e8546e08744740d2c55b745c33ccf0013..99956ae7ee64be31c59566d0447f31b4fa212057 100644 |
--- a/chrome/renderer/chrome_content_renderer_client.cc |
+++ b/chrome/renderer/chrome_content_renderer_client.cc |
@@ -108,6 +108,11 @@ |
#include "chrome/renderer/spellchecker/spellcheck_provider.h" |
#endif |
+#if defined(OS_ANDROID) |
+#include "chrome/common/encrypted_media_messages_android.h" |
+#include "chrome/renderer/media/encrypted_media_utils_android.h" |
+#endif |
+ |
using autofill::AutofillAgent; |
using autofill::PasswordAutofillAgent; |
using autofill::PasswordGenerationManager; |
@@ -1307,6 +1312,16 @@ void ChromeContentRendererClient::AddKeySystems( |
// 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. |
+#if defined(OS_ANDROID) |
+ std::vector<SupportedKeySystem> supported_systems; |
+ RenderThread::Get()->GetChannel()->Send( |
ddorwin
2013/09/16 17:58:10
Note: I used content::RenderThread::Get()->Send(),
qinmin
2013/09/17 19:21:06
ok, make it consistent with ur CL.
On 2013/09/16 1
jam
2013/09/17 20:26:02
RenderThread::Get()->Send is enough
regarding rou
qinmin
2013/09/17 21:26:23
This is moved to chrome_key_systems.cc, and using
|
+ new ChromeViewHostMsg_GetSupportedKeySystems( |
+ MSG_ROUTING_NONE, &supported_systems)); |
+ for (unsigned i = 0; i < supported_systems.size(); ++i) { |
ddorwin
2013/09/16 17:58:10
size_t
qinmin
2013/09/17 19:21:06
Done.
|
+ key_systems->push_back( |
+ SupportedKeySystemToKeySystemInfo(supported_systems[i])); |
ddorwin
2013/09/16 17:58:10
See ToT and https://codereview.chromium.org/238280
qinmin
2013/09/17 21:26:23
Done.
|
+ } |
+#endif // defined(OS_ANDROID) |
} |
bool ChromeContentRendererClient::ShouldReportDetailedMessageForSource( |