summaryrefslogtreecommitdiffstats
path: root/components/copresence
diff options
context:
space:
mode:
authorckehoe <ckehoe@chromium.org>2014-12-01 17:33:59 -0800
committerCommit bot <commit-bot@chromium.org>2014-12-02 01:34:21 +0000
commite915fcaea92ab93d4cc2e33f4787a8127d2308e6 (patch)
tree23b685e3bc3e3cef4bd49504e9d6ae005115bf68 /components/copresence
parent57dc71e6bf75f6f249c941a70c9139e1316516f9 (diff)
downloadchromium_src-e915fcaea92ab93d4cc2e33f4787a8127d2308e6.zip
chromium_src-e915fcaea92ab93d4cc2e33f4787a8127d2308e6.tar.gz
chromium_src-e915fcaea92ab93d4cc2e33f4787a8127d2308e6.tar.bz2
AudioManager::GetToken() should return empty if not currently playing
BUG=437978 Review URL: https://codereview.chromium.org/774483002 Cr-Commit-Position: refs/heads/master@{#306316}
Diffstat (limited to 'components/copresence')
-rw-r--r--components/copresence/mediums/audio/audio_manager_impl.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/components/copresence/mediums/audio/audio_manager_impl.cc b/components/copresence/mediums/audio/audio_manager_impl.cc
index 281c037..fadfdf9 100644
--- a/components/copresence/mediums/audio/audio_manager_impl.cc
+++ b/components/copresence/mediums/audio/audio_manager_impl.cc
@@ -158,7 +158,7 @@ void AudioManagerImpl::SetToken(AudioType type,
}
const std::string AudioManagerImpl::GetToken(AudioType type) {
- return playing_token_[type];
+ return playing_[type] ? playing_token_[type] : "";
}
bool AudioManagerImpl::IsRecording(AudioType type) {