media/blink/webcontentdecryptionmodule_impl.h - Issue 1535193003: Add missing macros includes in 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: media/blink/webcontentdecryptionmodule_impl.h

Issue 1535193003: Add missing macros includes in media/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 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 unified diff | Download patch

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 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 MEDIA_BLINK_WEBCONTENTDECRYPTIONMODULE_IMPL_H_	5 #ifndef MEDIA_BLINK_WEBCONTENTDECRYPTIONMODULE_IMPL_H_

6 #define MEDIA_BLINK_WEBCONTENTDECRYPTIONMODULE_IMPL_H_	6 #define MEDIA_BLINK_WEBCONTENTDECRYPTIONMODULE_IMPL_H_

7	7

	8 #include "base/macros.h"

8 #include "base/memory/ref_counted.h"	9 #include "base/memory/ref_counted.h"

9 #include "base/memory/scoped_ptr.h"	10 #include "base/memory/scoped_ptr.h"

10 #include "base/strings/string16.h"	11 #include "base/strings/string16.h"

11 #include "media/blink/media_blink_export.h"	12 #include "media/blink/media_blink_export.h"

12 #include "third_party/WebKit/public/platform/WebContentDecryptionModule.h"	13 #include "third_party/WebKit/public/platform/WebContentDecryptionModule.h"

13 #include "third_party/WebKit/public/platform/WebContentDecryptionModuleResult.h"	14 #include "third_party/WebKit/public/platform/WebContentDecryptionModuleResult.h"

14	15

15 namespace blink {	16 namespace blink {

16 #if defined(ENABLE_PEPPER_CDMS)	17 #if defined(ENABLE_PEPPER_CDMS)

17 class WebLocalFrame;	18 class WebLocalFrame;

(...skipping 47 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
65	66

66 // Allow typecasting from blink type as this is the only implementation.	67 // Allow typecasting from blink type as this is the only implementation.

67 inline WebContentDecryptionModuleImpl* ToWebContentDecryptionModuleImpl(	68 inline WebContentDecryptionModuleImpl* ToWebContentDecryptionModuleImpl(

68 blink::WebContentDecryptionModule* cdm) {	69 blink::WebContentDecryptionModule* cdm) {

69 return static_cast<WebContentDecryptionModuleImpl*>(cdm);	70 return static_cast<WebContentDecryptionModuleImpl*>(cdm);

70 }	71 }

71	72

72 } // namespace media	73 } // namespace media

73	74

74 #endif // MEDIA_BLINK_WEBCONTENTDECRYPTIONMODULE_IMPL_H_	75 #endif // MEDIA_BLINK_WEBCONTENTDECRYPTIONMODULE_IMPL_H_

OLD	NEW

« no previous file with comments | « media/blink/webaudiosourceprovider_impl.h ('k') | media/blink/webcontentdecryptionmoduleaccess_impl.h » ('j') | no next file with comments »