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

Side by Side Diff: media/blink/null_encrypted_media_player_support.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/blink/buffered_data_source_host_impl.h ('k') | media/blink/run_all_unittests.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_BLINK_NULL_ENCRYPTED_MEDIA_PLAYER_SUPPORT_H_ 5 #ifndef MEDIA_BLINK_NULL_ENCRYPTED_MEDIA_PLAYER_SUPPORT_H_
6 #define MEDIA_BLINK_NULL_ENCRYPTED_MEDIA_PLAYER_SUPPORT_H_ 6 #define MEDIA_BLINK_NULL_ENCRYPTED_MEDIA_PLAYER_SUPPORT_H_
7 7
8 #include "media/base/media_export.h" 8 #include "media/base/media_export.h"
9 #include "media/blink/encrypted_media_player_support.h" 9 #include "media/blink/encrypted_media_player_support.h"
10 10
11 namespace media { 11 namespace media {
12 12
13 // A "null" implementation of the EncryptedMediaPlayerSupport interface 13 // A "null" implementation of the EncryptedMediaPlayerSupport interface
14 // that indicates all key systems are not supported. This makes sure that 14 // that indicates all key systems are not supported. This makes sure that
15 // any attempts to play encrypted content always fail. 15 // any attempts to play encrypted content always fail.
16 class MEDIA_EXPORT NullEncryptedMediaPlayerSupport 16 class MEDIA_EXPORT NullEncryptedMediaPlayerSupport
17 : public EncryptedMediaPlayerSupport { 17 : public EncryptedMediaPlayerSupport {
18 public: 18 public:
19 static scoped_ptr<EncryptedMediaPlayerSupport> Create( 19 static scoped_ptr<EncryptedMediaPlayerSupport> Create(
20 blink::WebMediaPlayerClient* client); 20 blink::WebMediaPlayerClient* client);
21 21
22 virtual ~NullEncryptedMediaPlayerSupport(); 22 virtual ~NullEncryptedMediaPlayerSupport();
23 23
24 // Prefixed API methods. 24 // Prefixed API methods.
25 virtual blink::WebMediaPlayer::MediaKeyException GenerateKeyRequest( 25 virtual blink::WebMediaPlayer::MediaKeyException GenerateKeyRequest(
26 blink::WebLocalFrame* frame, 26 blink::WebLocalFrame* frame,
27 const blink::WebString& key_system, 27 const blink::WebString& key_system,
28 const unsigned char* init_data, 28 const unsigned char* init_data,
29 unsigned init_data_length) OVERRIDE; 29 unsigned init_data_length) override;
30 30
31 virtual blink::WebMediaPlayer::MediaKeyException AddKey( 31 virtual blink::WebMediaPlayer::MediaKeyException AddKey(
32 const blink::WebString& key_system, 32 const blink::WebString& key_system,
33 const unsigned char* key, 33 const unsigned char* key,
34 unsigned key_length, 34 unsigned key_length,
35 const unsigned char* init_data, 35 const unsigned char* init_data,
36 unsigned init_data_length, 36 unsigned init_data_length,
37 const blink::WebString& session_id) OVERRIDE; 37 const blink::WebString& session_id) override;
38 38
39 virtual blink::WebMediaPlayer::MediaKeyException CancelKeyRequest( 39 virtual blink::WebMediaPlayer::MediaKeyException CancelKeyRequest(
40 const blink::WebString& key_system, 40 const blink::WebString& key_system,
41 const blink::WebString& session_id) OVERRIDE; 41 const blink::WebString& session_id) override;
42 42
43 43
44 // Unprefixed API methods. 44 // Unprefixed API methods.
45 virtual void SetInitialContentDecryptionModule( 45 virtual void SetInitialContentDecryptionModule(
46 blink::WebContentDecryptionModule* initial_cdm) OVERRIDE; 46 blink::WebContentDecryptionModule* initial_cdm) override;
47 virtual void SetContentDecryptionModule( 47 virtual void SetContentDecryptionModule(
48 blink::WebContentDecryptionModule* cdm) OVERRIDE; 48 blink::WebContentDecryptionModule* cdm) override;
49 virtual void SetContentDecryptionModule( 49 virtual void SetContentDecryptionModule(
50 blink::WebContentDecryptionModule* cdm, 50 blink::WebContentDecryptionModule* cdm,
51 blink::WebContentDecryptionModuleResult result) OVERRIDE; 51 blink::WebContentDecryptionModuleResult result) override;
52 52
53 53
54 // Callback factory and notification methods used by WebMediaPlayerImpl. 54 // Callback factory and notification methods used by WebMediaPlayerImpl.
55 55
56 // Creates a callback that Demuxers can use to signal that the content 56 // Creates a callback that Demuxers can use to signal that the content
57 // requires a key. This method makes sure the callback returned can be safely 57 // requires a key. This method makes sure the callback returned can be safely
58 // invoked from any thread. 58 // invoked from any thread.
59 virtual Demuxer::NeedKeyCB CreateNeedKeyCB() OVERRIDE; 59 virtual Demuxer::NeedKeyCB CreateNeedKeyCB() override;
60 60
61 // Creates a callback that renderers can use to set decryptor 61 // Creates a callback that renderers can use to set decryptor
62 // ready callback. This method makes sure the callback returned can be safely 62 // ready callback. This method makes sure the callback returned can be safely
63 // invoked from any thread. 63 // invoked from any thread.
64 virtual SetDecryptorReadyCB CreateSetDecryptorReadyCB() OVERRIDE; 64 virtual SetDecryptorReadyCB CreateSetDecryptorReadyCB() override;
65 65
66 // Called to inform this object that the media pipeline encountered 66 // Called to inform this object that the media pipeline encountered
67 // and handled a decryption error. 67 // and handled a decryption error.
68 virtual void OnPipelineDecryptError() OVERRIDE; 68 virtual void OnPipelineDecryptError() override;
69 69
70 private: 70 private:
71 NullEncryptedMediaPlayerSupport(); 71 NullEncryptedMediaPlayerSupport();
72 72
73 DISALLOW_COPY_AND_ASSIGN(NullEncryptedMediaPlayerSupport); 73 DISALLOW_COPY_AND_ASSIGN(NullEncryptedMediaPlayerSupport);
74 }; 74 };
75 75
76 } // namespace media 76 } // namespace media
77 77
78 #endif // MEDIA_BLINK_NULL_ENCRYPTED_MEDIA_PLAYER_SUPPORT_H_ 78 #endif // MEDIA_BLINK_NULL_ENCRYPTED_MEDIA_PLAYER_SUPPORT_H_
OLDNEW
« no previous file with comments | « media/blink/buffered_data_source_host_impl.h ('k') | media/blink/run_all_unittests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698