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

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

Issue 1309103002: Revert of Update mojo sdk to rev c02a28868825edfa57ab77947b8cb15e741c5598 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 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
« no previous file with comments | « mandoline/ui/aura/surface_binding.cc ('k') | media/mojo/services/mojo_renderer_impl.h » ('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"
18 17
19 namespace mojo { 18 namespace mojo {
20 class ServiceProvider; 19 class ServiceProvider;
21 } 20 }
22 21
23 namespace media { 22 namespace media {
24 23
25 // A MediaKeys that proxies to a interfaces::ContentDecryptionModule. That 24 // A MediaKeys that proxies to a interfaces::ContentDecryptionModule. That
26 // interfaces::ContentDecryptionModule proxies back to the MojoCdm via the 25 // interfaces::ContentDecryptionModule proxies back to the MojoCdm via the
27 // interfaces::ContentDecryptionModuleClient interface. 26 // interfaces::ContentDecryptionModuleClient interface.
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 SessionExpirationUpdateCB session_expiration_update_cb_; 124 SessionExpirationUpdateCB session_expiration_update_cb_;
126 125
127 base::WeakPtrFactory<MojoCdm> weak_factory_; 126 base::WeakPtrFactory<MojoCdm> weak_factory_;
128 127
129 DISALLOW_COPY_AND_ASSIGN(MojoCdm); 128 DISALLOW_COPY_AND_ASSIGN(MojoCdm);
130 }; 129 };
131 130
132 } // namespace media 131 } // namespace media
133 132
134 #endif // MEDIA_MOJO_SERVICES_MOJO_CDM_H_ 133 #endif // MEDIA_MOJO_SERVICES_MOJO_CDM_H_
OLDNEW
« no previous file with comments | « mandoline/ui/aura/surface_binding.cc ('k') | media/mojo/services/mojo_renderer_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698