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

Side by Side Diff: content/browser/renderer_host/media/audio_input_device_manager.cc

Issue 1907973003: media: Move audio_parameters and audio_point to media/base/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 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/browser/renderer_host/media/audio_input_device_manager.h" 5 #include "content/browser/renderer_host/media/audio_input_device_manager.h"
6 6
7 #include <memory> 7 #include <memory>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/metrics/histogram_macros.h" 10 #include "base/metrics/histogram_macros.h"
11 #include "build/build_config.h" 11 #include "build/build_config.h"
12 #include "content/public/browser/browser_thread.h" 12 #include "content/public/browser/browser_thread.h"
13 #include "content/public/common/media_stream_request.h" 13 #include "content/public/common/media_stream_request.h"
14 #include "media/audio/audio_input_ipc.h" 14 #include "media/audio/audio_input_ipc.h"
15 #include "media/audio/audio_manager_base.h" 15 #include "media/audio/audio_manager_base.h"
16 #include "media/audio/audio_parameters.h" 16 #include "media/base/audio_parameters.h"
17 #include "media/base/channel_layout.h" 17 #include "media/base/channel_layout.h"
18 18
19 #if defined(OS_CHROMEOS) 19 #if defined(OS_CHROMEOS)
20 #include "chromeos/audio/cras_audio_handler.h" 20 #include "chromeos/audio/cras_audio_handler.h"
21 #endif 21 #endif
22 22
23 namespace content { 23 namespace content {
24 24
25 const int AudioInputDeviceManager::kFakeOpenSessionId = 1; 25 const int AudioInputDeviceManager::kFakeOpenSessionId = 1;
26 26
(...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after
300 #if defined(OS_CHROMEOS) 300 #if defined(OS_CHROMEOS)
301 void AudioInputDeviceManager::SetKeyboardMicStreamActiveOnUIThread( 301 void AudioInputDeviceManager::SetKeyboardMicStreamActiveOnUIThread(
302 bool active) { 302 bool active) {
303 DCHECK_CURRENTLY_ON(BrowserThread::UI); 303 DCHECK_CURRENTLY_ON(BrowserThread::UI);
304 chromeos::CrasAudioHandler::Get()->SetKeyboardMicActive(active); 304 chromeos::CrasAudioHandler::Get()->SetKeyboardMicActive(active);
305 } 305 }
306 #endif 306 #endif
307 307
308 308
309 } // namespace content 309 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698