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 452643002: Add UMA reporting to CdmPromise. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix nit. Created 6 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
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
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 }; 47 };
48 48
49 // Must be a superset of cdm::MediaKeyException. 49 // Must be a superset of cdm::MediaKeyException.
50 enum Exception { 50 enum Exception {
51 NOT_SUPPORTED_ERROR, 51 NOT_SUPPORTED_ERROR,
52 INVALID_STATE_ERROR, 52 INVALID_STATE_ERROR,
53 INVALID_ACCESS_ERROR, 53 INVALID_ACCESS_ERROR,
54 QUOTA_EXCEEDED_ERROR, 54 QUOTA_EXCEEDED_ERROR,
55 UNKNOWN_ERROR, 55 UNKNOWN_ERROR,
56 CLIENT_ERROR, 56 CLIENT_ERROR,
57 OUTPUT_ERROR 57 OUTPUT_ERROR,
58 NUM_EXCEPTIONS // Insert new exceptions before this.
58 }; 59 };
59 60
60 // Type of license required when creating/loading a session. 61 // Type of license required when creating/loading a session.
61 // Must be consistent with the values specified in the spec: 62 // Must be consistent with the values specified in the spec:
62 // https://dvcs.w3.org/hg/html-media/raw-file/default/encrypted-media/encrypte d-media.html#extensions 63 // https://dvcs.w3.org/hg/html-media/raw-file/default/encrypted-media/encrypte d-media.html#extensions
63 enum SessionType { 64 enum SessionType {
64 TEMPORARY_SESSION, 65 TEMPORARY_SESSION,
65 PERSISTENT_SESSION 66 PERSISTENT_SESSION
66 }; 67 };
67 68
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 typedef base::Callback<void(const std::string& web_session_id)> SessionClosedCB; 117 typedef base::Callback<void(const std::string& web_session_id)> SessionClosedCB;
117 118
118 typedef base::Callback<void(const std::string& web_session_id, 119 typedef base::Callback<void(const std::string& web_session_id,
119 MediaKeys::Exception exception_code, 120 MediaKeys::Exception exception_code,
120 uint32 system_code, 121 uint32 system_code,
121 const std::string& error_message)> SessionErrorCB; 122 const std::string& error_message)> SessionErrorCB;
122 123
123 } // namespace media 124 } // namespace media
124 125
125 #endif // MEDIA_BASE_MEDIA_KEYS_H_ 126 #endif // MEDIA_BASE_MEDIA_KEYS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698