OLD | NEW |
---|---|
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 CONTENT_BROWSER_MEDIA_ANDROID_MEDIA_DRM_CREDENTIAL_MANAGER_H_ | 5 #ifndef CONTENT_BROWSER_MEDIA_ANDROID_MEDIA_DRM_CREDENTIAL_MANAGER_H_ |
6 #define CONTENT_BROWSER_MEDIA_ANDROID_MEDIA_DRM_CREDENTIAL_MANAGER_H_ | 6 #define CONTENT_BROWSER_MEDIA_ANDROID_MEDIA_DRM_CREDENTIAL_MANAGER_H_ |
7 | 7 |
8 #include <jni.h> | 8 #include <jni.h> |
9 #include <string> | 9 #include <string> |
10 | 10 |
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
45 // reset is completed. | 45 // reset is completed. |
46 void OnResetCredentialsCompleted(SecurityLevel security_level, bool success); | 46 void OnResetCredentialsCompleted(SecurityLevel security_level, bool success); |
47 | 47 |
48 // Resets DRM credentials for a particular |security_level|. Returns false if | 48 // Resets DRM credentials for a particular |security_level|. Returns false if |
49 // we fail to create the MediaDrmBridge at all, in which case we cannot reset | 49 // we fail to create the MediaDrmBridge at all, in which case we cannot reset |
50 // the credentials. Otherwise, the result is returned asynchronously in | 50 // the credentials. Otherwise, the result is returned asynchronously in |
51 // OnResetCredentialsCompleted() function. | 51 // OnResetCredentialsCompleted() function. |
52 bool ResetCredentialsInternal(SecurityLevel security_level); | 52 bool ResetCredentialsInternal(SecurityLevel security_level); |
53 | 53 |
54 // The MediaDrmBridge object used to perform the credential reset. | 54 // The MediaDrmBridge object used to perform the credential reset. |
55 scoped_ptr<media::MediaDrmBridge> media_drm_bridge_; | 55 scoped_ptr<media::MediaDrmBridge, media::BrowserCdmDeleter> media_drm_bridge_; |
xhwang
2015/09/29 17:28:23
Use BrowserCdmPtr?
Tima Vaisburd
2015/09/29 19:55:44
This seems like the only place that I can do this
| |
56 | 56 |
57 // The callback provided by the caller. | 57 // The callback provided by the caller. |
58 ResetCredentialsCB reset_credentials_cb_; | 58 ResetCredentialsCB reset_credentials_cb_; |
59 | 59 |
60 DISALLOW_COPY_AND_ASSIGN(MediaDrmCredentialManager); | 60 DISALLOW_COPY_AND_ASSIGN(MediaDrmCredentialManager); |
61 }; | 61 }; |
62 | 62 |
63 } // namespace content | 63 } // namespace content |
64 | 64 |
65 #endif // CONTENT_BROWSER_MEDIA_ANDROID_MEDIA_DRM_CREDENTIAL_MANAGER_H_ | 65 #endif // CONTENT_BROWSER_MEDIA_ANDROID_MEDIA_DRM_CREDENTIAL_MANAGER_H_ |
OLD | NEW |