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

Side by Side Diff: content/renderer/media/media_stream_audio_sink_owner.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_MEDIA_STREAM_AUDIO_SINK_OWNER_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_MEDIA_STREAM_AUDIO_SINK_OWNER_H_
6 #define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_AUDIO_SINK_OWNER_H_ 6 #define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_AUDIO_SINK_OWNER_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/synchronization/lock.h" 10 #include "base/synchronization/lock.h"
(...skipping 10 matching lines...) Expand all
21 21
22 // MediaStreamAudioTrackSink implementation. 22 // MediaStreamAudioTrackSink implementation.
23 virtual int OnData(const int16* audio_data, 23 virtual int OnData(const int16* audio_data,
24 int sample_rate, 24 int sample_rate,
25 int number_of_channels, 25 int number_of_channels,
26 int number_of_frames, 26 int number_of_frames,
27 const std::vector<int>& channels, 27 const std::vector<int>& channels,
28 int audio_delay_milliseconds, 28 int audio_delay_milliseconds,
29 int current_volume, 29 int current_volume,
30 bool need_audio_processing, 30 bool need_audio_processing,
31 bool key_pressed) OVERRIDE; 31 bool key_pressed) override;
32 virtual void OnSetFormat(const media::AudioParameters& params) OVERRIDE; 32 virtual void OnSetFormat(const media::AudioParameters& params) override;
33 virtual void OnReadyStateChanged( 33 virtual void OnReadyStateChanged(
34 blink::WebMediaStreamSource::ReadyState state) OVERRIDE; 34 blink::WebMediaStreamSource::ReadyState state) override;
35 virtual void Reset() OVERRIDE; 35 virtual void Reset() override;
36 virtual bool IsEqual(const MediaStreamAudioSink* other) const OVERRIDE; 36 virtual bool IsEqual(const MediaStreamAudioSink* other) const override;
37 virtual bool IsEqual(const PeerConnectionAudioSink* other) const OVERRIDE; 37 virtual bool IsEqual(const PeerConnectionAudioSink* other) const override;
38 38
39 protected: 39 protected:
40 virtual ~MediaStreamAudioSinkOwner() {} 40 virtual ~MediaStreamAudioSinkOwner() {}
41 41
42 private: 42 private:
43 mutable base::Lock lock_; 43 mutable base::Lock lock_;
44 44
45 // Raw pointer to the delegate, the client need to call Reset() to set the 45 // Raw pointer to the delegate, the client need to call Reset() to set the
46 // pointer to NULL before the delegate goes away. 46 // pointer to NULL before the delegate goes away.
47 MediaStreamAudioSink* delegate_; 47 MediaStreamAudioSink* delegate_;
48 48
49 DISALLOW_COPY_AND_ASSIGN(MediaStreamAudioSinkOwner); 49 DISALLOW_COPY_AND_ASSIGN(MediaStreamAudioSinkOwner);
50 }; 50 };
51 51
52 } // namespace content 52 } // namespace content
53 53
54 #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_AUDIO_SINK_OWNER_H_ 54 #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_AUDIO_SINK_OWNER_H_
OLDNEW
« no previous file with comments | « content/renderer/media/media_stream_audio_processor.h ('k') | content/renderer/media/media_stream_audio_source.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698