Index: media/audio/audio_manager_base.cc |
diff --git a/media/audio/audio_manager_base.cc b/media/audio/audio_manager_base.cc |
index 43568cfe1cdd4db3ddb6e65a0ec0e766e7679e04..7ed50016cf7045566fa50421f4951ad0293f1b6b 100644 |
--- a/media/audio/audio_manager_base.cc |
+++ b/media/audio/audio_manager_base.cc |
@@ -11,31 +11,35 @@ |
#include "base/strings/string_number_conversions.h" |
#include "base/thread_task_runner_handle.h" |
#include "build/build_config.h" |
+#include "chrome/grit/chromium_strings.h" |
+#include "chrome/grit/generated_resources.h" |
#include "media/audio/audio_output_dispatcher_impl.h" |
#include "media/audio/audio_output_proxy.h" |
#include "media/audio/audio_output_resampler.h" |
#include "media/audio/fake_audio_input_stream.h" |
#include "media/audio/fake_audio_output_stream.h" |
#include "media/base/media_switches.h" |
+#include "ui/base/l10n/l10n_util.h" |
namespace media { |
+namespace { |
-static const int kStreamCloseDelaySeconds = 5; |
+const int kStreamCloseDelaySeconds = 5; |
// Default maximum number of output streams that can be open simultaneously |
// for all platforms. |
-static const int kDefaultMaxOutputStreams = 16; |
+const int kDefaultMaxOutputStreams = 16; |
// Default maximum number of input streams that can be open simultaneously |
// for all platforms. |
-static const int kDefaultMaxInputStreams = 16; |
+const int kDefaultMaxInputStreams = 16; |
-static const int kMaxInputChannels = 3; |
+const int kMaxInputChannels = 3; |
+ |
+} // namespace |
-const char AudioManagerBase::kDefaultDeviceName[] = "Default"; |
const char AudioManagerBase::kDefaultDeviceId[] = "default"; |
const char AudioManagerBase::kCommunicationsDeviceId[] = "communications"; |
-const char AudioManagerBase::kCommunicationsDeviceName[] = "Communications"; |
const char AudioManagerBase::kLoopbackInputDeviceId[] = "loopback"; |
struct AudioManagerBase::DispatcherParams { |
@@ -384,6 +388,15 @@ AudioParameters AudioManagerBase::GetInputStreamParameters( |
return AudioParameters(); |
} |
+std::string AudioManagerBase::GetDefaultDeviceName() const { |
+ return l10n_util::GetStringUTF8(IDS_DEFAULT_AUDIO_DEVICE_NAME); |
ajm
2015/09/15 00:04:25
The localization guidelines recommend using UTF-16
|
+} |
+ |
+std::string AudioManagerBase::GetCommunicationsDeviceName() const { |
+ NOTREACHED(); |
+ return ""; |
+} |
+ |
std::string AudioManagerBase::GetAssociatedOutputDeviceID( |
const std::string& input_device_id) { |
return ""; |