content/browser/media/cdm/browser_cdm_manager.h - Issue 959503002: BrowserCdmManager: Do not pass MIME types as init_data_type.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/media/cdm/browser_cdm_manager.h

Issue 959503002: BrowserCdmManager: Do not pass MIME types as init_data_type. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Add USE_PROPRIETARY_CODECS guards to fix Android GN build (see crbug.com/461901). Created 5 years, 10 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: content/browser/media/cdm/browser_cdm_manager.h

diff --git a/content/browser/media/cdm/browser_cdm_manager.h b/content/browser/media/cdm/browser_cdm_manager.h

index e7c87c9bbc589a9d776f109b98b6fd7ed068370b..973ecff1c1124196e837ababe66a9dd2ada29185 100644

--- a/content/browser/media/cdm/browser_cdm_manager.h

+++ b/content/browser/media/cdm/browser_cdm_manager.h

@@ -19,6 +19,7 @@

#include "content/public/browser/browser_message_filter.h"

#include "ipc/ipc_message.h"

#include "media/base/cdm_promise.h"

+#include "media/base/eme_constants.h"

#include "media/base/media_keys.h"

#include "url/gurl.h"

@@ -147,7 +148,7 @@ class CONTENT_EXPORT BrowserCdmManager : public BrowserMessageFilter {

int render_frame_id,

const GURL& security_origin,

int cdm_id,

- const std::string& init_data_type,

+ media::EmeInitDataType init_data_type,

const std::vector<uint8>& init_data,

scoped_ptr<media::NewSessionCdmPromise> promise);

@@ -159,7 +160,7 @@ class CONTENT_EXPORT BrowserCdmManager : public BrowserMessageFilter {

void GenerateRequestIfPermitted(

int render_frame_id,

int cdm_id,

- const std::string& init_data_type,

+ media::EmeInitDataType init_data_type,

const std::vector<uint8>& init_data,

scoped_ptr<media::NewSessionCdmPromise> promise,

bool permitted);

« no previous file with comments | « no previous file | content/browser/media/cdm/browser_cdm_manager.cc » ('j') | no next file with comments »