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

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

Issue 813683005: Add |legacy_destination_url| back to SessionMessage for EME (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: changes Created 5 years, 11 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 | « media/mojo/interfaces/content_decryption_module.mojom ('k') | media/mojo/services/mojo_cdm.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 "base/macros.h" 8 #include "base/macros.h"
9 #include "base/memory/weak_ptr.h" 9 #include "base/memory/weak_ptr.h"
10 #include "media/base/media_keys.h" 10 #include "media/base/media_keys.h"
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 void CloseSession(const std::string& session_id, 52 void CloseSession(const std::string& session_id,
53 scoped_ptr<SimpleCdmPromise> promise) final; 53 scoped_ptr<SimpleCdmPromise> promise) final;
54 void RemoveSession(const std::string& session_id, 54 void RemoveSession(const std::string& session_id,
55 scoped_ptr<SimpleCdmPromise> promise) final; 55 scoped_ptr<SimpleCdmPromise> promise) final;
56 CdmContext* GetCdmContext() final; 56 CdmContext* GetCdmContext() final;
57 57
58 private: 58 private:
59 // mojo::ContentDecryptionModuleClient implementation. 59 // mojo::ContentDecryptionModuleClient implementation.
60 void OnSessionMessage(const mojo::String& session_id, 60 void OnSessionMessage(const mojo::String& session_id,
61 mojo::CdmMessageType message_type, 61 mojo::CdmMessageType message_type,
62 mojo::Array<uint8_t> message) final; 62 mojo::Array<uint8_t> message,
63 const mojo::String& legacy_destination_url) final;
63 void OnSessionClosed(const mojo::String& session_id) final; 64 void OnSessionClosed(const mojo::String& session_id) final;
64 void OnSessionError(const mojo::String& session_id, 65 void OnSessionError(const mojo::String& session_id,
65 mojo::CdmException exception, 66 mojo::CdmException exception,
66 uint32_t system_code, 67 uint32_t system_code,
67 const mojo::String& error_message) final; 68 const mojo::String& error_message) final;
68 void OnSessionKeysChange( 69 void OnSessionKeysChange(
69 const mojo::String& session_id, 70 const mojo::String& session_id,
70 bool has_additional_usable_key, 71 bool has_additional_usable_key,
71 mojo::Array<mojo::CdmKeyInformationPtr> keys_info) final; 72 mojo::Array<mojo::CdmKeyInformationPtr> keys_info) final;
72 void OnSessionExpirationUpdate(const mojo::String& session_id, 73 void OnSessionExpirationUpdate(const mojo::String& session_id,
(...skipping 15 matching lines...) Expand all
88 SessionExpirationUpdateCB session_expiration_update_cb_; 89 SessionExpirationUpdateCB session_expiration_update_cb_;
89 90
90 base::WeakPtrFactory<MojoCdm> weak_factory_; 91 base::WeakPtrFactory<MojoCdm> weak_factory_;
91 92
92 DISALLOW_COPY_AND_ASSIGN(MojoCdm); 93 DISALLOW_COPY_AND_ASSIGN(MojoCdm);
93 }; 94 };
94 95
95 } // namespace media 96 } // namespace media
96 97
97 #endif // MEDIA_MOJO_SERVICES_MOJO_CDM_H_ 98 #endif // MEDIA_MOJO_SERVICES_MOJO_CDM_H_
OLDNEW
« no previous file with comments | « media/mojo/interfaces/content_decryption_module.mojom ('k') | media/mojo/services/mojo_cdm.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698