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

Side by Side Diff: media/mojo/clients/mojo_cdm.h

Issue 2444683002: Move MediaKeys::Exception to CdmPromise::Exception (Closed)
Patch Set: fix for media_remoting_unittests Created 4 years, 2 months 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 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 MEDIA_MOJO_CLIENTS_MOJO_CDM_H_ 5 #ifndef MEDIA_MOJO_CLIENTS_MOJO_CDM_H_
6 #define MEDIA_MOJO_CLIENTS_MOJO_CDM_H_ 6 #define MEDIA_MOJO_CLIENTS_MOJO_CDM_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory> 10 #include <memory>
11 #include <utility> 11 #include <utility>
12 #include <vector> 12 #include <vector>
13 13
14 #include "base/macros.h" 14 #include "base/macros.h"
15 #include "base/memory/weak_ptr.h" 15 #include "base/memory/weak_ptr.h"
16 #include "base/synchronization/lock.h" 16 #include "base/synchronization/lock.h"
17 #include "base/threading/thread_checker.h" 17 #include "base/threading/thread_checker.h"
18 #include "media/base/cdm_context.h" 18 #include "media/base/cdm_context.h"
19 #include "media/base/cdm_initialized_promise.h" 19 #include "media/base/cdm_initialized_promise.h"
20 #include "media/base/cdm_promise.h"
xhwang 2016/10/24 17:06:14 ditto, only include in .cc file
20 #include "media/base/media_keys.h" 21 #include "media/base/media_keys.h"
21 #include "media/mojo/interfaces/content_decryption_module.mojom.h" 22 #include "media/mojo/interfaces/content_decryption_module.mojom.h"
22 #include "mojo/public/cpp/bindings/binding.h" 23 #include "mojo/public/cpp/bindings/binding.h"
23 24
24 namespace base { 25 namespace base {
25 class SingleThreadTaskRunner; 26 class SingleThreadTaskRunner;
26 } 27 }
27 28
28 namespace media { 29 namespace media {
29 30
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 155
155 // This must be the last member. 156 // This must be the last member.
156 base::WeakPtrFactory<MojoCdm> weak_factory_; 157 base::WeakPtrFactory<MojoCdm> weak_factory_;
157 158
158 DISALLOW_COPY_AND_ASSIGN(MojoCdm); 159 DISALLOW_COPY_AND_ASSIGN(MojoCdm);
159 }; 160 };
160 161
161 } // namespace media 162 } // namespace media
162 163
163 #endif // MEDIA_MOJO_CLIENTS_MOJO_CDM_H_ 164 #endif // MEDIA_MOJO_CLIENTS_MOJO_CDM_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698