media/blink/webcontentdecryptionmoduleaccess_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/webcontentdecryptionmoduleaccess_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

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

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_WEBCONTENTDECRYPTIONMODULEACCESS_IMPL_H_	5 #ifndef MEDIA_BLINK_WEBCONTENTDECRYPTIONMODULEACCESS_IMPL_H_

6 #define MEDIA_BLINK_WEBCONTENTDECRYPTIONMODULEACCESS_IMPL_H_	6 #define MEDIA_BLINK_WEBCONTENTDECRYPTIONMODULEACCESS_IMPL_H_

7	7

	8 #include "base/macros.h"

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

9 #include "media/base/cdm_config.h"	10 #include "media/base/cdm_config.h"

10 #include "third_party/WebKit/public/platform/WebContentDecryptionModuleAccess.h"	11 #include "third_party/WebKit/public/platform/WebContentDecryptionModuleAccess.h"

11 #include "third_party/WebKit/public/platform/WebContentDecryptionModuleResult.h"	12 #include "third_party/WebKit/public/platform/WebContentDecryptionModuleResult.h"

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

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

14 #include "third_party/WebKit/public/platform/WebString.h"	15 #include "third_party/WebKit/public/platform/WebString.h"

15	16

16 namespace media {	17 namespace media {

17	18

(...skipping 30 matching lines...) Expand all Loading...
48	49

49 // Keep a WeakPtr as client is owned by render_frame_impl.	50 // Keep a WeakPtr as client is owned by render_frame_impl.

50 base::WeakPtr<WebEncryptedMediaClientImpl> client_;	51 base::WeakPtr<WebEncryptedMediaClientImpl> client_;

51	52

52 DISALLOW_COPY_AND_ASSIGN(WebContentDecryptionModuleAccessImpl);	53 DISALLOW_COPY_AND_ASSIGN(WebContentDecryptionModuleAccessImpl);

53 };	54 };

54	55

55 } // namespace media	56 } // namespace media

56	57

57 #endif // MEDIA_BLINK_WEBCONTENTDECRYPTIONMODULEACCESS_IMPL_H_	58 #endif // MEDIA_BLINK_WEBCONTENTDECRYPTIONMODULEACCESS_IMPL_H_

OLD	NEW