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

Side by Side Diff: media/base/android/media_drm_bridge.h

Issue 623263003: replace OVERRIDE and FINAL with override and final in media/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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/audio_decoder_job.h ('k') | media/base/android/media_player_bridge.h » ('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 (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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_ANDROID_MEDIA_DRM_BRIDGE_H_ 5 #ifndef MEDIA_BASE_ANDROID_MEDIA_DRM_BRIDGE_H_
6 #define MEDIA_BASE_ANDROID_MEDIA_DRM_BRIDGE_H_ 6 #define MEDIA_BASE_ANDROID_MEDIA_DRM_BRIDGE_H_
7 7
8 #include <jni.h> 8 #include <jni.h>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 // - If this function is not called, the default security level of the device 84 // - If this function is not called, the default security level of the device
85 // will be used. 85 // will be used.
86 // - It's recommended to call this function only once on a MediaDrmBridge 86 // - It's recommended to call this function only once on a MediaDrmBridge
87 // object. Calling this function multiples times may cause errors. 87 // object. Calling this function multiples times may cause errors.
88 bool SetSecurityLevel(SecurityLevel security_level); 88 bool SetSecurityLevel(SecurityLevel security_level);
89 89
90 // BrowserCdm implementations. 90 // BrowserCdm implementations.
91 virtual bool CreateSession(uint32 session_id, 91 virtual bool CreateSession(uint32 session_id,
92 const std::string& content_type, 92 const std::string& content_type,
93 const uint8* init_data, 93 const uint8* init_data,
94 int init_data_length) OVERRIDE; 94 int init_data_length) override;
95 virtual void LoadSession(uint32 session_id, 95 virtual void LoadSession(uint32 session_id,
96 const std::string& web_session_id) OVERRIDE; 96 const std::string& web_session_id) override;
97 virtual void UpdateSession(uint32 session_id, 97 virtual void UpdateSession(uint32 session_id,
98 const uint8* response, 98 const uint8* response,
99 int response_length) OVERRIDE; 99 int response_length) override;
100 virtual void ReleaseSession(uint32 session_id) OVERRIDE; 100 virtual void ReleaseSession(uint32 session_id) override;
101 virtual int RegisterPlayer(const base::Closure& new_key_cb, 101 virtual int RegisterPlayer(const base::Closure& new_key_cb,
102 const base::Closure& cdm_unset_cb) OVERRIDE; 102 const base::Closure& cdm_unset_cb) override;
103 virtual void UnregisterPlayer(int registration_id) OVERRIDE; 103 virtual void UnregisterPlayer(int registration_id) override;
104 104
105 // Returns a MediaCrypto object if it's already created. Returns a null object 105 // Returns a MediaCrypto object if it's already created. Returns a null object
106 // otherwise. 106 // otherwise.
107 base::android::ScopedJavaLocalRef<jobject> GetMediaCrypto(); 107 base::android::ScopedJavaLocalRef<jobject> GetMediaCrypto();
108 108
109 // Sets callback which will be called when MediaCrypto is ready. 109 // Sets callback which will be called when MediaCrypto is ready.
110 // If |closure| is null, previously set callback will be cleared. 110 // If |closure| is null, previously set callback will be cleared.
111 void SetMediaCryptoReadyCB(const base::Closure& closure); 111 void SetMediaCryptoReadyCB(const base::Closure& closure);
112 112
113 // Called after a MediaCrypto object is created. 113 // Called after a MediaCrypto object is created.
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
166 ResetCredentialsCB reset_credentials_cb_; 166 ResetCredentialsCB reset_credentials_cb_;
167 167
168 PlayerTrackerImpl player_tracker_; 168 PlayerTrackerImpl player_tracker_;
169 169
170 DISALLOW_COPY_AND_ASSIGN(MediaDrmBridge); 170 DISALLOW_COPY_AND_ASSIGN(MediaDrmBridge);
171 }; 171 };
172 172
173 } // namespace media 173 } // namespace media
174 174
175 #endif // MEDIA_BASE_ANDROID_MEDIA_DRM_BRIDGE_H_ 175 #endif // MEDIA_BASE_ANDROID_MEDIA_DRM_BRIDGE_H_
OLDNEW
« no previous file with comments | « media/base/android/audio_decoder_job.h ('k') | media/base/android/media_player_bridge.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698