content/shell/renderer/shell_content_renderer_client.h - Issue 2268283003: media: Add External Clear Key content browser test on Android

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/shell/renderer/shell_content_renderer_client.h

Issue 2268283003: media: Add External Clear Key content browser test on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix compile error Created 4 years, 4 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

« content/browser/media/encrypted_media_browsertest.cc ('K') | « content/shell/renderer/DEPS ('k') | content/shell/renderer/shell_content_renderer_client.cc » ('j') | media/base/android/android_cdm_factory.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/shell/renderer/shell_content_renderer_client.h

diff --git a/content/shell/renderer/shell_content_renderer_client.h b/content/shell/renderer/shell_content_renderer_client.h

index f0e03318f8d60bb9bfd4f92ba70034fe431a0483..7ad69716f5ad688adfb7efb0e91619ebd5f5fd82 100644

--- a/content/shell/renderer/shell_content_renderer_client.h

+++ b/content/shell/renderer/shell_content_renderer_client.h

@@ -8,6 +8,7 @@

#include <memory>

#include "base/compiler_specific.h"

+#include "build/build_config.h"

#include "content/public/renderer/content_renderer_client.h"

namespace web_cache {

@@ -36,6 +37,12 @@ class ShellContentRendererClient : public ContentRendererClient {

void ExposeInterfacesToBrowser(

shell::InterfaceRegistry* interface_registry) override;

+#if defined(OS_ANDROID)

+ void AddSupportedKeySystems(

+ std::vector<std::unique_ptr<media::KeySystemProperties>>* key_systems)

+ override;

+#endif

private:

std::unique_ptr<web_cache::WebCacheImpl> web_cache_impl_;

};