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

Side by Side Diff: content/renderer/media/audio_message_filter.cc

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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #include "content/renderer/media/audio_message_filter.h" 5 #include "content/renderer/media/audio_message_filter.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/message_loop/message_loop_proxy.h" 8 #include "base/message_loop/message_loop_proxy.h"
9 #include "base/strings/stringprintf.h" 9 #include "base/strings/stringprintf.h"
10 #include "content/common/media/audio_messages.h" 10 #include "content/common/media/audio_messages.h"
(...skipping 11 matching lines...) Expand all
22 : public NON_EXPORTED_BASE(media::AudioOutputIPC) { 22 : public NON_EXPORTED_BASE(media::AudioOutputIPC) {
23 public: 23 public:
24 AudioOutputIPCImpl(const scoped_refptr<AudioMessageFilter>& filter, 24 AudioOutputIPCImpl(const scoped_refptr<AudioMessageFilter>& filter,
25 int render_view_id, 25 int render_view_id,
26 int render_frame_id); 26 int render_frame_id);
27 virtual ~AudioOutputIPCImpl(); 27 virtual ~AudioOutputIPCImpl();
28 28
29 // media::AudioOutputIPC implementation. 29 // media::AudioOutputIPC implementation.
30 virtual void CreateStream(media::AudioOutputIPCDelegate* delegate, 30 virtual void CreateStream(media::AudioOutputIPCDelegate* delegate,
31 const media::AudioParameters& params, 31 const media::AudioParameters& params,
32 int session_id) OVERRIDE; 32 int session_id) override;
33 virtual void PlayStream() OVERRIDE; 33 virtual void PlayStream() override;
34 virtual void PauseStream() OVERRIDE; 34 virtual void PauseStream() override;
35 virtual void CloseStream() OVERRIDE; 35 virtual void CloseStream() override;
36 virtual void SetVolume(double volume) OVERRIDE; 36 virtual void SetVolume(double volume) override;
37 37
38 private: 38 private:
39 const scoped_refptr<AudioMessageFilter> filter_; 39 const scoped_refptr<AudioMessageFilter> filter_;
40 const int render_view_id_; 40 const int render_view_id_;
41 const int render_frame_id_; 41 const int render_frame_id_;
42 int stream_id_; 42 int stream_id_;
43 }; 43 };
44 44
45 AudioMessageFilter* AudioMessageFilter::g_filter = NULL; 45 AudioMessageFilter* AudioMessageFilter::g_filter = NULL;
46 46
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
236 audio_hardware_config_->UpdateOutputConfig(output_params); 236 audio_hardware_config_->UpdateOutputConfig(output_params);
237 } 237 }
238 238
239 void AudioMessageFilter::SetAudioHardwareConfig( 239 void AudioMessageFilter::SetAudioHardwareConfig(
240 media::AudioHardwareConfig* config) { 240 media::AudioHardwareConfig* config) {
241 base::AutoLock auto_lock(lock_); 241 base::AutoLock auto_lock(lock_);
242 audio_hardware_config_ = config; 242 audio_hardware_config_ = config;
243 } 243 }
244 244
245 } // namespace content 245 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/audio_message_filter.h ('k') | content/renderer/media/audio_message_filter_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698