summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authorscherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-18 02:33:50 +0000
committerscherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-18 02:33:50 +0000
commit258bf337d4dc01db381fc769a05629f273ea7923 (patch)
tree65d3617ce2c90cf63e3791b3f20fe7204bc42212 /content
parent5e3e0963e07c653f31fd5b57f5de596f4a0863e7 (diff)
downloadchromium_src-258bf337d4dc01db381fc769a05629f273ea7923.zip
chromium_src-258bf337d4dc01db381fc769a05629f273ea7923.tar.gz
chromium_src-258bf337d4dc01db381fc769a05629f273ea7923.tar.bz2
Fix media code to use initializer-list style for inheritance.
Review URL: http://codereview.chromium.org/7400013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92826 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/browser/renderer_host/media/audio_input_renderer_host.h5
-rw-r--r--content/browser/renderer_host/media/audio_renderer_host.h5
-rw-r--r--content/browser/renderer_host/media/media_stream_manager.h5
-rw-r--r--content/browser/renderer_host/media/video_capture_host.h5
-rw-r--r--content/renderer/media/audio_device.h7
-rw-r--r--content/renderer/media/audio_input_device.h7
-rw-r--r--content/renderer/media/audio_renderer_impl.h9
7 files changed, 25 insertions, 18 deletions
diff --git a/content/browser/renderer_host/media/audio_input_renderer_host.h b/content/browser/renderer_host/media/audio_input_renderer_host.h
index b7d40b4..5fde275 100644
--- a/content/browser/renderer_host/media/audio_input_renderer_host.h
+++ b/content/browser/renderer_host/media/audio_input_renderer_host.h
@@ -35,8 +35,9 @@
class AudioManager;
struct AudioParameters;
-class AudioInputRendererHost : public BrowserMessageFilter,
- public media::AudioInputController::EventHandler {
+class AudioInputRendererHost
+ : public BrowserMessageFilter,
+ public media::AudioInputController::EventHandler {
public:
struct AudioEntry {
AudioEntry();
diff --git a/content/browser/renderer_host/media/audio_renderer_host.h b/content/browser/renderer_host/media/audio_renderer_host.h
index 8837d5a..52d0fca 100644
--- a/content/browser/renderer_host/media/audio_renderer_host.h
+++ b/content/browser/renderer_host/media/audio_renderer_host.h
@@ -73,8 +73,9 @@ namespace content {
class ResourceContext;
} // namespace content
-class AudioRendererHost : public BrowserMessageFilter,
- public media::AudioOutputController::EventHandler {
+class AudioRendererHost
+ : public BrowserMessageFilter,
+ public media::AudioOutputController::EventHandler {
public:
struct AudioEntry {
AudioEntry();
diff --git a/content/browser/renderer_host/media/media_stream_manager.h b/content/browser/renderer_host/media/media_stream_manager.h
index 108cafe..f5792ce 100644
--- a/content/browser/renderer_host/media/media_stream_manager.h
+++ b/content/browser/renderer_host/media/media_stream_manager.h
@@ -38,8 +38,9 @@ class VideoCaptureManager;
// start the media flow.
// The classes requesting new media streams are answered using
// MediaStreamManager::Listener.
-class MediaStreamManager : public MediaStreamProviderListener,
- public SettingsRequester {
+class MediaStreamManager
+ : public MediaStreamProviderListener,
+ public SettingsRequester {
public:
typedef MediaStreamManager* (AccessorMethod)();
static MediaStreamManager* Get();
diff --git a/content/browser/renderer_host/media/video_capture_host.h b/content/browser/renderer_host/media/video_capture_host.h
index 4abed9a..335ee4b 100644
--- a/content/browser/renderer_host/media/video_capture_host.h
+++ b/content/browser/renderer_host/media/video_capture_host.h
@@ -43,8 +43,9 @@
#include "content/browser/renderer_host/media/video_capture_controller.h"
#include "ipc/ipc_message.h"
-class VideoCaptureHost : public BrowserMessageFilter,
- public VideoCaptureControllerEventHandler {
+class VideoCaptureHost
+ : public BrowserMessageFilter,
+ public VideoCaptureControllerEventHandler {
public:
VideoCaptureHost();
diff --git a/content/renderer/media/audio_device.h b/content/renderer/media/audio_device.h
index b53f9bf..f36399c 100644
--- a/content/renderer/media/audio_device.h
+++ b/content/renderer/media/audio_device.h
@@ -57,9 +57,10 @@
struct AudioParameters;
-class AudioDevice : public AudioMessageFilter::Delegate,
- public base::DelegateSimpleThread::Delegate,
- public base::RefCountedThreadSafe<AudioDevice> {
+class AudioDevice
+ : public AudioMessageFilter::Delegate,
+ public base::DelegateSimpleThread::Delegate,
+ public base::RefCountedThreadSafe<AudioDevice> {
public:
class RenderCallback {
public:
diff --git a/content/renderer/media/audio_input_device.h b/content/renderer/media/audio_input_device.h
index 4099452..c4e0e17 100644
--- a/content/renderer/media/audio_input_device.h
+++ b/content/renderer/media/audio_input_device.h
@@ -59,9 +59,10 @@ struct AudioParameters;
// TODO(henrika): This class is based on the AudioDevice class and it has
// many components in common. Investigate potential for re-factoring.
-class AudioInputDevice : public AudioInputMessageFilter::Delegate,
- public base::DelegateSimpleThread::Delegate,
- public base::RefCountedThreadSafe<AudioInputDevice> {
+class AudioInputDevice
+ : public AudioInputMessageFilter::Delegate,
+ public base::DelegateSimpleThread::Delegate,
+ public base::RefCountedThreadSafe<AudioInputDevice> {
public:
class CaptureCallback {
public:
diff --git a/content/renderer/media/audio_renderer_impl.h b/content/renderer/media/audio_renderer_impl.h
index 5ba9bc5..c234da0 100644
--- a/content/renderer/media/audio_renderer_impl.h
+++ b/content/renderer/media/audio_renderer_impl.h
@@ -52,10 +52,11 @@
class AudioMessageFilter;
-class AudioRendererImpl : public media::AudioRendererBase,
- public AudioMessageFilter::Delegate,
- public base::DelegateSimpleThread::Delegate,
- public MessageLoop::DestructionObserver {
+class AudioRendererImpl
+ : public media::AudioRendererBase,
+ public AudioMessageFilter::Delegate,
+ public base::DelegateSimpleThread::Delegate,
+ public MessageLoop::DestructionObserver {
public:
// Methods called on Render thread ------------------------------------------
explicit AudioRendererImpl();