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

Side by Side Diff: content/renderer/media/audio_renderer_mixer_manager.h

Issue 1547073003: Switch to standard integer types in content/renderer/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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 #ifndef CONTENT_RENDERER_MEDIA_AUDIO_RENDERER_MIXER_MANAGER_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_AUDIO_RENDERER_MIXER_MANAGER_H_
6 #define CONTENT_RENDERER_MEDIA_AUDIO_RENDERER_MIXER_MANAGER_H_ 6 #define CONTENT_RENDERER_MEDIA_AUDIO_RENDERER_MIXER_MANAGER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
11 11
12 #include "base/macros.h"
12 #include "base/synchronization/lock.h" 13 #include "base/synchronization/lock.h"
13 #include "content/common/content_export.h" 14 #include "content/common/content_export.h"
14 #include "media/audio/audio_parameters.h" 15 #include "media/audio/audio_parameters.h"
15 #include "media/base/output_device.h" 16 #include "media/base/output_device.h"
16 #include "url/origin.h" 17 #include "url/origin.h"
17 18
18 namespace media { 19 namespace media {
19 class AudioHardwareConfig; 20 class AudioHardwareConfig;
20 class AudioRendererMixer; 21 class AudioRendererMixer;
21 class AudioRendererMixerInput; 22 class AudioRendererMixerInput;
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 base::Lock mixers_lock_; 126 base::Lock mixers_lock_;
126 127
127 media::AudioRendererSink* sink_for_testing_; 128 media::AudioRendererSink* sink_for_testing_;
128 129
129 DISALLOW_COPY_AND_ASSIGN(AudioRendererMixerManager); 130 DISALLOW_COPY_AND_ASSIGN(AudioRendererMixerManager);
130 }; 131 };
131 132
132 } // namespace content 133 } // namespace content
133 134
134 #endif // CONTENT_RENDERER_MEDIA_AUDIO_RENDERER_MIXER_MANAGER_H_ 135 #endif // CONTENT_RENDERER_MEDIA_AUDIO_RENDERER_MIXER_MANAGER_H_
OLDNEW
« no previous file with comments | « content/renderer/media/audio_message_filter_unittest.cc ('k') | content/renderer/media/audio_renderer_mixer_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698