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

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

Issue 920963003: Moved scoped_histogram_timer to the main histogram_macros.h. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove gyp entries for old unit test in media/ Created 5 years, 10 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 "base/bind.h" 7 #include "base/bind.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/metrics/histogram_macros.h"
9 #include "content/public/browser/browser_thread.h" 10 #include "content/public/browser/browser_thread.h"
10 #include "content/public/common/media_stream_request.h" 11 #include "content/public/common/media_stream_request.h"
11 #include "media/audio/audio_input_ipc.h" 12 #include "media/audio/audio_input_ipc.h"
12 #include "media/audio/audio_manager_base.h" 13 #include "media/audio/audio_manager_base.h"
13 #include "media/audio/audio_parameters.h" 14 #include "media/audio/audio_parameters.h"
14 #include "media/base/channel_layout.h" 15 #include "media/base/channel_layout.h"
15 #include "media/base/scoped_histogram_timer.h"
16 16
17 #if defined(OS_CHROMEOS) 17 #if defined(OS_CHROMEOS)
18 #include "chromeos/audio/cras_audio_handler.h" 18 #include "chromeos/audio/cras_audio_handler.h"
19 #endif 19 #endif
20 20
21 namespace content { 21 namespace content {
22 22
23 const int AudioInputDeviceManager::kFakeOpenSessionId = 1; 23 const int AudioInputDeviceManager::kFakeOpenSessionId = 1;
24 24
25 namespace { 25 namespace {
(...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after
297 #if defined(OS_CHROMEOS) 297 #if defined(OS_CHROMEOS)
298 void AudioInputDeviceManager::SetKeyboardMicStreamActiveOnUIThread( 298 void AudioInputDeviceManager::SetKeyboardMicStreamActiveOnUIThread(
299 bool active) { 299 bool active) {
300 DCHECK_CURRENTLY_ON(BrowserThread::UI); 300 DCHECK_CURRENTLY_ON(BrowserThread::UI);
301 chromeos::CrasAudioHandler::Get()->SetKeyboardMicActive(active); 301 chromeos::CrasAudioHandler::Get()->SetKeyboardMicActive(active);
302 } 302 }
303 #endif 303 #endif
304 304
305 305
306 } // namespace content 306 } // namespace content
OLDNEW
« no previous file with comments | « chrome/browser/profiles/profile_manager.cc ('k') | content/browser/renderer_host/media/video_capture_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698