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

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

Issue 893363002: Update {virtual,override,final} to follow C++11 style. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 10 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 17 matching lines...) Expand all
28 class MEDIA_EXPORT MediaDrmBridge : public BrowserCdm { 28 class MEDIA_EXPORT MediaDrmBridge : public BrowserCdm {
29 public: 29 public:
30 enum SecurityLevel { 30 enum SecurityLevel {
31 SECURITY_LEVEL_NONE = 0, 31 SECURITY_LEVEL_NONE = 0,
32 SECURITY_LEVEL_1 = 1, 32 SECURITY_LEVEL_1 = 1,
33 SECURITY_LEVEL_3 = 3, 33 SECURITY_LEVEL_3 = 3,
34 }; 34 };
35 35
36 typedef base::Callback<void(bool)> ResetCredentialsCB; 36 typedef base::Callback<void(bool)> ResetCredentialsCB;
37 37
38 virtual ~MediaDrmBridge(); 38 ~MediaDrmBridge() override;
39 39
40 // Checks whether MediaDRM is available. 40 // Checks whether MediaDRM is available.
41 // All other static methods check IsAvailable() internally. There's no need 41 // All other static methods check IsAvailable() internally. There's no need
42 // to check IsAvailable() explicitly before calling them. 42 // to check IsAvailable() explicitly before calling them.
43 static bool IsAvailable(); 43 static bool IsAvailable();
44 44
45 static bool IsSecurityLevelSupported(const std::string& key_system, 45 static bool IsSecurityLevelSupported(const std::string& key_system,
46 SecurityLevel security_level); 46 SecurityLevel security_level);
47 47
48 // Checks whether |key_system| is supported. 48 // Checks whether |key_system| is supported.
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after
213 PlayerTrackerImpl player_tracker_; 213 PlayerTrackerImpl player_tracker_;
214 214
215 CdmPromiseAdapter cdm_promise_adapter_; 215 CdmPromiseAdapter cdm_promise_adapter_;
216 216
217 DISALLOW_COPY_AND_ASSIGN(MediaDrmBridge); 217 DISALLOW_COPY_AND_ASSIGN(MediaDrmBridge);
218 }; 218 };
219 219
220 } // namespace media 220 } // namespace media
221 221
222 #endif // MEDIA_BASE_ANDROID_MEDIA_DRM_BRIDGE_H_ 222 #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