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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: media/remoting/remote_renderer_impl.cc

Issue 2568463003: media: Rename MediaKeys to ContentDecryptionModule (Closed)
Patch Set: Created 4 years 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
« media/mojo/clients/mojo_cdm_unittest.cc ('K') | « media/remoting/proto/remoting_rpc_message.proto ('k') | media/remoting/remoting_cdm.h » ('j') | media/remoting/rpc/proto_utils.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/remoting/remote_renderer_impl.cc
diff --git a/media/remoting/remote_renderer_impl.cc b/media/remoting/remote_renderer_impl.cc
index 63c0ff0d02b49fdff0d2810be78db61cfdf0adf6..a38407df765c74052faf630a50733a8d98384e1c 100644
--- a/media/remoting/remote_renderer_impl.cc
+++ b/media/remoting/remote_renderer_impl.cc
@@ -13,8 +13,8 @@
#include "base/message_loop/message_loop.h"
#include "base/time/time.h"
#include "media/base/bind_to_current_loop.h"
+#include "media/base/content_decryption_module.h"
jrummell 2016/12/12 22:08:40 nit: Don't think this is needed.
xhwang 2016/12/12 22:32:51 Done.
#include "media/base/demuxer_stream_provider.h"
-#include "media/base/media_keys.h"
#include "media/remoting/remote_demuxer_stream_adapter.h"
#include "media/remoting/remoting_renderer_controller.h"
#include "media/remoting/rpc/proto_enum_utils.h"
« media/mojo/clients/mojo_cdm_unittest.cc ('K') | « media/remoting/proto/remoting_rpc_message.proto ('k') | media/remoting/remoting_cdm.h » ('j') | media/remoting/rpc/proto_utils.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698