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

Side by Side Diff: media/mojo/services/mojo_cdm_service.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
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_SERVICE_H_ 5 #ifndef MEDIA_MOJO_SERVICES_MOJO_CDM_SERVICE_H_
6 #define MEDIA_MOJO_SERVICES_MOJO_CDM_SERVICE_H_ 6 #define MEDIA_MOJO_SERVICES_MOJO_CDM_SERVICE_H_
7 7
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 #include "base/memory/weak_ptr.h" 12 #include "base/memory/weak_ptr.h"
13 #include "media/base/media_keys.h" 13 #include "media/base/media_keys.h"
14 #include "media/mojo/interfaces/content_decryption_module.mojom.h" 14 #include "media/mojo/interfaces/content_decryption_module.mojom.h"
15 #include "media/mojo/services/mojo_cdm_promise.h" 15 #include "media/mojo/services/mojo_cdm_promise.h"
16 #include "media/mojo/services/mojo_cdm_service_context.h" 16 #include "media/mojo/services/mojo_cdm_service_context.h"
17 #include "mojo/application/public/interfaces/service_provider.mojom.h" 17 #include "mojo/application/public/interfaces/service_provider.mojom.h"
18 #include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h" 18 #include "mojo/public/cpp/bindings/strong_binding.h"
19 19
20 namespace media { 20 namespace media {
21 21
22 class CdmFactory; 22 class CdmFactory;
23 23
24 // A interfaces::ContentDecryptionModule implementation backed by a 24 // A interfaces::ContentDecryptionModule implementation backed by a
25 // media::MediaKeys. 25 // media::MediaKeys.
26 class MojoCdmService : public interfaces::ContentDecryptionModule { 26 class MojoCdmService : public interfaces::ContentDecryptionModule {
27 public: 27 public:
28 // Constructs a MojoCdmService and strongly binds it to the |request|. 28 // Constructs a MojoCdmService and strongly binds it to the |request|.
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 115
116 base::WeakPtr<MojoCdmService> weak_this_; 116 base::WeakPtr<MojoCdmService> weak_this_;
117 base::WeakPtrFactory<MojoCdmService> weak_factory_; 117 base::WeakPtrFactory<MojoCdmService> weak_factory_;
118 118
119 DISALLOW_COPY_AND_ASSIGN(MojoCdmService); 119 DISALLOW_COPY_AND_ASSIGN(MojoCdmService);
120 }; 120 };
121 121
122 } // namespace media 122 } // namespace media
123 123
124 #endif // MEDIA_MOJO_SERVICES_MOJO_CDM_SERVICE_H_ 124 #endif // MEDIA_MOJO_SERVICES_MOJO_CDM_SERVICE_H_
OLDNEW
« no previous file with comments | « media/mojo/services/mojo_cdm_promise.h ('k') | media/mojo/services/mojo_demuxer_stream_adapter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698