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

Side by Side Diff: media/base/media_keys.h

Issue 297703002: Using GURL in place of std::string for destination_url (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 years, 6 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/base/android/media_source_player_unittest.cc ('k') | media/cdm/aes_decryptor.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_BASE_MEDIA_KEYS_H_ 5 #ifndef MEDIA_BASE_MEDIA_KEYS_H_
6 #define MEDIA_BASE_MEDIA_KEYS_H_ 6 #define MEDIA_BASE_MEDIA_KEYS_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/basictypes.h" 11 #include "base/basictypes.h"
12 #include "base/callback.h" 12 #include "base/callback.h"
13 #include "base/memory/scoped_ptr.h" 13 #include "base/memory/scoped_ptr.h"
14 #include "media/base/media_export.h" 14 #include "media/base/media_export.h"
15 #include "url/gurl.h"
15 16
16 namespace media { 17 namespace media {
17 18
18 class Decryptor; 19 class Decryptor;
19 20
20 // Performs media key operations. 21 // Performs media key operations.
21 // 22 //
22 // All key operations are called on the renderer thread. Therefore, these calls 23 // All key operations are called on the renderer thread. Therefore, these calls
23 // should be fast and nonblocking; key events should be fired asynchronously. 24 // should be fast and nonblocking; key events should be fired asynchronously.
24 class MEDIA_EXPORT MediaKeys { 25 class MEDIA_EXPORT MediaKeys {
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 private: 76 private:
76 DISALLOW_COPY_AND_ASSIGN(MediaKeys); 77 DISALLOW_COPY_AND_ASSIGN(MediaKeys);
77 }; 78 };
78 79
79 // Key event callbacks. See the spec for details: 80 // Key event callbacks. See the spec for details:
80 // https://dvcs.w3.org/hg/html-media/raw-file/default/encrypted-media/encrypted- media.html#event-summary 81 // https://dvcs.w3.org/hg/html-media/raw-file/default/encrypted-media/encrypted- media.html#event-summary
81 typedef base::Callback< 82 typedef base::Callback<
82 void(uint32 session_id, const std::string& web_session_id)> 83 void(uint32 session_id, const std::string& web_session_id)>
83 SessionCreatedCB; 84 SessionCreatedCB;
84 85
85 // TODO(xhwang): Use GURL for |destination_url|. See http://crbug.com/372877
86 typedef base::Callback<void(uint32 session_id, 86 typedef base::Callback<void(uint32 session_id,
87 const std::vector<uint8>& message, 87 const std::vector<uint8>& message,
88 const std::string& destination_url)> 88 const GURL& destination_url)> SessionMessageCB;
89 SessionMessageCB;
90 89
91 typedef base::Callback<void(uint32 session_id)> SessionReadyCB; 90 typedef base::Callback<void(uint32 session_id)> SessionReadyCB;
92 91
93 typedef base::Callback<void(uint32 session_id)> SessionClosedCB; 92 typedef base::Callback<void(uint32 session_id)> SessionClosedCB;
94 93
95 typedef base::Callback<void(uint32 session_id, 94 typedef base::Callback<void(uint32 session_id,
96 media::MediaKeys::KeyError error_code, 95 media::MediaKeys::KeyError error_code,
97 uint32 system_code)> SessionErrorCB; 96 uint32 system_code)> SessionErrorCB;
98 97
99 } // namespace media 98 } // namespace media
100 99
101 #endif // MEDIA_BASE_MEDIA_KEYS_H_ 100 #endif // MEDIA_BASE_MEDIA_KEYS_H_
OLDNEW
« no previous file with comments | « media/base/android/media_source_player_unittest.cc ('k') | media/cdm/aes_decryptor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698