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

Side by Side Diff: content/renderer/media/android/media_source_delegate.h

Issue 633303002: Replace FINAL and OVERRIDE with their C++11 counterparts in content/renderer (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
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 CONTENT_RENDERER_MEDIA_ANDROID_MEDIA_SOURCE_DELEGATE_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_ANDROID_MEDIA_SOURCE_DELEGATE_H_
6 #define CONTENT_RENDERER_MEDIA_ANDROID_MEDIA_SOURCE_DELEGATE_H_ 6 #define CONTENT_RENDERER_MEDIA_ANDROID_MEDIA_SOURCE_DELEGATE_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 98
99 // Called on the main thread to check whether the video stream is encrypted. 99 // Called on the main thread to check whether the video stream is encrypted.
100 bool IsVideoEncrypted(); 100 bool IsVideoEncrypted();
101 101
102 // Gets the ChunkDemuxer timeline offset. 102 // Gets the ChunkDemuxer timeline offset.
103 base::Time GetTimelineOffset() const; 103 base::Time GetTimelineOffset() const;
104 104
105 private: 105 private:
106 // Methods inherited from DemuxerHost. 106 // Methods inherited from DemuxerHost.
107 virtual void AddBufferedTimeRange(base::TimeDelta start, 107 virtual void AddBufferedTimeRange(base::TimeDelta start,
108 base::TimeDelta end) OVERRIDE; 108 base::TimeDelta end) override;
109 virtual void SetDuration(base::TimeDelta duration) OVERRIDE; 109 virtual void SetDuration(base::TimeDelta duration) override;
110 virtual void OnDemuxerError(media::PipelineStatus status) OVERRIDE; 110 virtual void OnDemuxerError(media::PipelineStatus status) override;
111 virtual void AddTextStream(media::DemuxerStream* text_stream, 111 virtual void AddTextStream(media::DemuxerStream* text_stream,
112 const media::TextTrackConfig& config) OVERRIDE; 112 const media::TextTrackConfig& config) override;
113 virtual void RemoveTextStream(media::DemuxerStream* text_stream) OVERRIDE; 113 virtual void RemoveTextStream(media::DemuxerStream* text_stream) override;
114 114
115 // Notifies |demuxer_client_| and fires |duration_changed_cb_|. 115 // Notifies |demuxer_client_| and fires |duration_changed_cb_|.
116 void OnDurationChanged(const base::TimeDelta& duration); 116 void OnDurationChanged(const base::TimeDelta& duration);
117 117
118 // Callback for ChunkDemuxer initialization. 118 // Callback for ChunkDemuxer initialization.
119 void OnDemuxerInitDone(media::PipelineStatus status); 119 void OnDemuxerInitDone(media::PipelineStatus status);
120 120
121 // Initializes DecryptingDemuxerStreams if audio/video stream is encrypted. 121 // Initializes DecryptingDemuxerStreams if audio/video stream is encrypted.
122 void InitAudioDecryptingDemuxerStream(); 122 void InitAudioDecryptingDemuxerStream();
123 void InitVideoDecryptingDemuxerStream(); 123 void InitVideoDecryptingDemuxerStream();
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
229 base::WeakPtrFactory<MediaSourceDelegate> main_weak_factory_; 229 base::WeakPtrFactory<MediaSourceDelegate> main_weak_factory_;
230 base::WeakPtrFactory<MediaSourceDelegate> media_weak_factory_; 230 base::WeakPtrFactory<MediaSourceDelegate> media_weak_factory_;
231 base::WeakPtr<MediaSourceDelegate> main_weak_this_; 231 base::WeakPtr<MediaSourceDelegate> main_weak_this_;
232 232
233 DISALLOW_COPY_AND_ASSIGN(MediaSourceDelegate); 233 DISALLOW_COPY_AND_ASSIGN(MediaSourceDelegate);
234 }; 234 };
235 235
236 } // namespace content 236 } // namespace content
237 237
238 #endif // CONTENT_RENDERER_MEDIA_ANDROID_MEDIA_SOURCE_DELEGATE_H_ 238 #endif // CONTENT_RENDERER_MEDIA_ANDROID_MEDIA_SOURCE_DELEGATE_H_
OLDNEW
« no previous file with comments | « content/renderer/media/aec_dump_message_filter.h ('k') | content/renderer/media/android/renderer_demuxer_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698