Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(422)

Side by Side Diff: media/blink/webcontentdecryptionmodulesession_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
OLDNEW
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_WEBCONTENTDECRYPTIONMODULESESSION_IMPL_H_ 5 #ifndef MEDIA_BLINK_WEBCONTENTDECRYPTIONMODULESESSION_IMPL_H_
6 #define MEDIA_BLINK_WEBCONTENTDECRYPTIONMODULESESSION_IMPL_H_ 6 #define MEDIA_BLINK_WEBCONTENTDECRYPTIONMODULESESSION_IMPL_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/callback.h" 11 #include "base/callback.h"
12 #include "base/macros.h"
12 #include "base/memory/ref_counted.h" 13 #include "base/memory/ref_counted.h"
13 #include "base/memory/weak_ptr.h" 14 #include "base/memory/weak_ptr.h"
14 #include "base/threading/thread_checker.h" 15 #include "base/threading/thread_checker.h"
15 #include "media/base/media_keys.h" 16 #include "media/base/media_keys.h"
16 #include "media/blink/new_session_cdm_result_promise.h" 17 #include "media/blink/new_session_cdm_result_promise.h"
17 #include "third_party/WebKit/public/platform/WebContentDecryptionModuleSession.h " 18 #include "third_party/WebKit/public/platform/WebContentDecryptionModuleSession.h "
18 #include "third_party/WebKit/public/platform/WebString.h" 19 #include "third_party/WebKit/public/platform/WebString.h"
19 20
20 namespace media { 21 namespace media {
21 22
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 // creating a promise in case this class disappears before the promise 82 // creating a promise in case this class disappears before the promise
82 // actually fires. 83 // actually fires.
83 base::WeakPtrFactory<WebContentDecryptionModuleSessionImpl> weak_ptr_factory_; 84 base::WeakPtrFactory<WebContentDecryptionModuleSessionImpl> weak_ptr_factory_;
84 85
85 DISALLOW_COPY_AND_ASSIGN(WebContentDecryptionModuleSessionImpl); 86 DISALLOW_COPY_AND_ASSIGN(WebContentDecryptionModuleSessionImpl);
86 }; 87 };
87 88
88 } // namespace media 89 } // namespace media
89 90
90 #endif // MEDIA_BLINK_WEBCONTENTDECRYPTIONMODULESESSION_IMPL_H_ 91 #endif // MEDIA_BLINK_WEBCONTENTDECRYPTIONMODULESESSION_IMPL_H_
OLDNEW
« no previous file with comments | « media/blink/webcontentdecryptionmoduleaccess_impl.h ('k') | media/blink/webinbandtexttrack_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698