chromecast/renderer/key_systems_cast.h - Issue 683893003: Chromecast buildfix: content::KeySystemsInfo moved to media namespace.

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: chromecast/renderer/key_systems_cast.h

Issue 683893003: Chromecast buildfix: content::KeySystemsInfo moved to media namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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:

View unified diff | Download patch

« no previous file with comments | « chromecast/renderer/cast_content_renderer_client.cc ('k') | chromecast/renderer/key_systems_cast.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 CHROMECAST_RENDERER_KEY_SYSTEMS_CAST_H_	5 #ifndef CHROMECAST_RENDERER_KEY_SYSTEMS_CAST_H_

6 #define CHROMECAST_RENDERER_KEY_SYSTEMS_CAST_H_	6 #define CHROMECAST_RENDERER_KEY_SYSTEMS_CAST_H_

7	7

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

9	9

10 #include "media/base/key_system_info.h"	10 #include "media/base/key_system_info.h"

11	11

12 namespace chromecast {	12 namespace chromecast {

13 namespace shell {	13 namespace shell {

14	14

15 // Adds a single key system by name.	15 // Adds a single key system by name.

16 void AddKeySystemWithCodecs(	16 void AddKeySystemWithCodecs(

17 const std::string& key_system_name,	17 const std::string& key_system_name,

18 std::vector<media::KeySystemInfo>* concrete_key_systems);	18 std::vector< ::media::KeySystemInfo>* concrete_key_systems);

19	19

20 void AddChromecastKeySystems(	20 void AddChromecastKeySystems(

21 std::vector<media::KeySystemInfo>* key_systems_info);	21 std::vector< ::media::KeySystemInfo>* key_systems_info);

22	22

23 // TODO(gunsch): Remove when prefixed EME is removed.	23 // TODO(gunsch): Remove when prefixed EME is removed.

24 void AddChromecastPlatformKeySystems(	24 void AddChromecastPlatformKeySystems(

25 std::vector<media::KeySystemInfo>* key_systems_info);	25 std::vector< ::media::KeySystemInfo>* key_systems_info);

26	26

27 } // namespace shell	27 } // namespace shell

28 } // namespace chromecast	28 } // namespace chromecast

29	29

30 #endif // CHROMECAST_RENDERER_KEY_SYSTEMS_CAST_H_	30 #endif // CHROMECAST_RENDERER_KEY_SYSTEMS_CAST_H_

OLD	NEW