components/cdm/renderer/android_key_systems.h - Issue 665343002: Move KeySystemInfo to media.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: components/cdm/renderer/android_key_systems.h

Issue 665343002: Move KeySystemInfo to media. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase only Created 6 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

« no previous file with comments | « components/cdm/renderer/DEPS ('k') | components/cdm/renderer/android_key_systems.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #ifndef COMPONENTS_CDM_RENDERER_ANDROID_KEY_SYSTEMS_H_	5 #ifndef COMPONENTS_CDM_RENDERER_ANDROID_KEY_SYSTEMS_H_

6 #define COMPONENTS_CDM_RENDERER_ANDROID_KEY_SYSTEMS_H_	6 #define COMPONENTS_CDM_RENDERER_ANDROID_KEY_SYSTEMS_H_

7	7

8 #include <vector>	8 #include <vector>

9	9

10 #include "content/public/renderer/key_system_info.h"	10 #include "media/base/key_system_info.h"

11	11

12 namespace cdm {	12 namespace cdm {

13	13

14 void AddAndroidWidevine(	14 void AddAndroidWidevine(

15 std::vector<content::KeySystemInfo>* concrete_key_systems);	15 std::vector<media::KeySystemInfo>* concrete_key_systems);

16	16

17 // Add platform-supported key systems which are not explicitly handled	17 // Add platform-supported key systems which are not explicitly handled

18 // by Chrome.	18 // by Chrome.

19 void AddAndroidPlatformKeySystems(	19 void AddAndroidPlatformKeySystems(

20 std::vector<content::KeySystemInfo>* concrete_key_systems);	20 std::vector<media::KeySystemInfo>* concrete_key_systems);

21	21

22 } // namespace cdm	22 } // namespace cdm

23	23

24 #endif // COMPONENTS_CDM_RENDERER_ANDROID_KEY_SYSTEMS_H_	24 #endif // COMPONENTS_CDM_RENDERER_ANDROID_KEY_SYSTEMS_H_

OLD	NEW