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

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

Issue 1410053006: Move third_party/mojo/src/mojo/public to mojo/public (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 5 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 | « media/mojo/services/media_type_converters.h ('k') | media/mojo/services/mojo_cdm_factory.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_SERVICES_MOJO_CDM_H_ 5 #ifndef MEDIA_MOJO_SERVICES_MOJO_CDM_H_
6 #define MEDIA_MOJO_SERVICES_MOJO_CDM_H_ 6 #define MEDIA_MOJO_SERVICES_MOJO_CDM_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
11 #include "base/memory/weak_ptr.h" 11 #include "base/memory/weak_ptr.h"
12 #include "media/base/cdm_context.h" 12 #include "media/base/cdm_context.h"
13 #include "media/base/cdm_initialized_promise.h" 13 #include "media/base/cdm_initialized_promise.h"
14 #include "media/base/media_keys.h" 14 #include "media/base/media_keys.h"
15 #include "media/mojo/interfaces/content_decryption_module.mojom.h" 15 #include "media/mojo/interfaces/content_decryption_module.mojom.h"
16 #include "media/mojo/services/mojo_type_trait.h" 16 #include "media/mojo/services/mojo_type_trait.h"
17 #include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" 17 #include "mojo/public/cpp/bindings/binding.h"
18 18
19 namespace mojo { 19 namespace mojo {
20 class ServiceProvider; 20 class ServiceProvider;
21 } 21 }
22 22
23 namespace media { 23 namespace media {
24 24
25 // A MediaKeys that proxies to a interfaces::ContentDecryptionModule. That 25 // A MediaKeys that proxies to a interfaces::ContentDecryptionModule. That
26 // interfaces::ContentDecryptionModule proxies back to the MojoCdm via the 26 // interfaces::ContentDecryptionModule proxies back to the MojoCdm via the
27 // interfaces::ContentDecryptionModuleClient interface. 27 // interfaces::ContentDecryptionModuleClient interface.
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 SessionExpirationUpdateCB session_expiration_update_cb_; 130 SessionExpirationUpdateCB session_expiration_update_cb_;
131 131
132 base::WeakPtrFactory<MojoCdm> weak_factory_; 132 base::WeakPtrFactory<MojoCdm> weak_factory_;
133 133
134 DISALLOW_COPY_AND_ASSIGN(MojoCdm); 134 DISALLOW_COPY_AND_ASSIGN(MojoCdm);
135 }; 135 };
136 136
137 } // namespace media 137 } // namespace media
138 138
139 #endif // MEDIA_MOJO_SERVICES_MOJO_CDM_H_ 139 #endif // MEDIA_MOJO_SERVICES_MOJO_CDM_H_
OLDNEW
« no previous file with comments | « media/mojo/services/media_type_converters.h ('k') | media/mojo/services/mojo_cdm_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698