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

Side by Side Diff: media/base/audio_renderer_mixer_input.h

Issue 1535193003: Add missing macros includes in media/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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/base/audio_renderer_mixer.h ('k') | media/base/audio_splicer.h » ('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 (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 #ifndef MEDIA_BASE_AUDIO_RENDERER_MIXER_INPUT_H_ 5 #ifndef MEDIA_BASE_AUDIO_RENDERER_MIXER_INPUT_H_
6 #define MEDIA_BASE_AUDIO_RENDERER_MIXER_INPUT_H_ 6 #define MEDIA_BASE_AUDIO_RENDERER_MIXER_INPUT_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/callback.h" 10 #include "base/callback.h"
11 #include "base/macros.h"
11 #include "media/base/audio_converter.h" 12 #include "media/base/audio_converter.h"
12 #include "media/base/audio_renderer_sink.h" 13 #include "media/base/audio_renderer_sink.h"
13 #include "url/origin.h" 14 #include "url/origin.h"
14 15
15 namespace media { 16 namespace media {
16 17
17 class AudioRendererMixer; 18 class AudioRendererMixer;
18 19
19 class MEDIA_EXPORT AudioRendererMixerInput 20 class MEDIA_EXPORT AudioRendererMixerInput
20 : NON_EXPORTED_BASE(public RestartableAudioRendererSink), 21 : NON_EXPORTED_BASE(public RestartableAudioRendererSink),
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 SwitchOutputDeviceCB pending_switch_callback_; 98 SwitchOutputDeviceCB pending_switch_callback_;
98 std::string pending_switch_device_id_; 99 std::string pending_switch_device_id_;
99 url::Origin pending_switch_security_origin_; 100 url::Origin pending_switch_security_origin_;
100 101
101 DISALLOW_COPY_AND_ASSIGN(AudioRendererMixerInput); 102 DISALLOW_COPY_AND_ASSIGN(AudioRendererMixerInput);
102 }; 103 };
103 104
104 } // namespace media 105 } // namespace media
105 106
106 #endif // MEDIA_BASE_AUDIO_RENDERER_MIXER_INPUT_H_ 107 #endif // MEDIA_BASE_AUDIO_RENDERER_MIXER_INPUT_H_
OLDNEW
« no previous file with comments | « media/base/audio_renderer_mixer.h ('k') | media/base/audio_splicer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698