| OLD | NEW |
|---|
| 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 "base/command_line.h" | 5 #include "base/command_line.h" |
| 6 #include "base/metrics/histogram.h" | 6 #include "base/metrics/histogram_macros.h" |
| 7 #include "media/base/media_switches.h" | 7 #include "media/base/media_switches.h" |
| 8 | 8 |
| 9 #if defined(USE_ALSA) | 9 #if defined(USE_ALSA) |
| 10 #include "media/audio/alsa/audio_manager_alsa.h" | 10 #include "media/audio/alsa/audio_manager_alsa.h" |
| 11 #else | 11 #else |
| 12 #include "media/audio/fake_audio_manager.h" | 12 #include "media/audio/fake_audio_manager.h" |
| 13 #endif | 13 #endif |
| 14 #if defined(USE_CRAS) | 14 #if defined(USE_CRAS) |
| 15 #include "media/audio/cras/audio_manager_cras.h" | 15 #include "media/audio/cras/audio_manager_cras.h" |
| 16 #endif | 16 #endif |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 60 new AudioManagerAlsa(std::move(task_runner), | 60 new AudioManagerAlsa(std::move(task_runner), |
| 61 std::move(worker_task_runner), audio_log_factory)); | 61 std::move(worker_task_runner), audio_log_factory)); |
| 62 #else | 62 #else |
| 63 return ScopedAudioManagerPtr( | 63 return ScopedAudioManagerPtr( |
| 64 new FakeAudioManager(std::move(task_runner), | 64 new FakeAudioManager(std::move(task_runner), |
| 65 std::move(worker_task_runner), audio_log_factory)); | 65 std::move(worker_task_runner), audio_log_factory)); |
| 66 #endif | 66 #endif |
| 67 } | 67 } |
| 68 | 68 |
| 69 } // namespace media | 69 } // namespace media |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2639313002:
Migrate desktop Linux to histogram_macros.h include. (Closed)
