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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: media/remoting/rpc/proto_utils.h

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/remoting/remote_renderer_impl.cc ('K') | « media/remoting/rpc/proto_enum_utils.cc ('k') | media/remoting/rpc/proto_utils.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/remoting/rpc/proto_utils.h
diff --git a/media/remoting/rpc/proto_utils.h b/media/remoting/rpc/proto_utils.h
index b0df4338667bc46d0dc3abcc1a89e5f7dee3aa7c..84d086f9c8a221027b342ca74ba5c08ae8467a72 100644
--- a/media/remoting/rpc/proto_utils.h
+++ b/media/remoting/rpc/proto_utils.h
@@ -15,10 +15,10 @@
#include "media/base/cdm_config.h"
#include "media/base/cdm_key_information.h"
#include "media/base/cdm_promise.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/decoder_buffer.h"
#include "media/base/demuxer_stream.h"
#include "media/base/eme_constants.h"
-#include "media/base/media_keys.h"
#include "media/base/pipeline_status.h"
#include "media/base/video_decoder_config.h"
#include "media/remoting/remoting_rpc_message.pb.h"
« media/remoting/remote_renderer_impl.cc ('K') | « media/remoting/rpc/proto_enum_utils.cc ('k') | media/remoting/rpc/proto_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698