diff options
author | xians@chromium.org <xians@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-03 10:21:23 +0000 |
---|---|---|
committer | xians@chromium.org <xians@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-03 10:21:23 +0000 |
commit | e751e2080ef2a63f070eef83d8a8d079c3e39008 (patch) | |
tree | e62f0ce58666147fc392d99bf6246a3bfa88db28 /chrome/browser/notifications | |
parent | 1ca262b629c6e51439db53c37cf15e40ea2475b9 (diff) | |
download | chromium_src-e751e2080ef2a63f070eef83d8a8d079c3e39008.zip chromium_src-e751e2080ef2a63f070eef83d8a8d079c3e39008.tar.gz chromium_src-e751e2080ef2a63f070eef83d8a8d079c3e39008.tar.bz2 |
Revert 203686 "Trying relanding this CL, the original CL passed ..."
> Trying relanding this CL, the original CL passed the try bots but failed the mac 10.7 bot, I am keeping an eye on the bots and will revert it if it fails the bot again.
>
> Hook up the device selection to the WebAudio live audio.
> WebAudio live audio needs to pass the session_id to the browser process so that Chrome can open the correct input device for unitfied IO.
>
> This CL looks big because it touches quite some interfaces from the render to the browser. But the change is simple and basically adding a session_id/device_id to the classes. All the changes some together and it is very hard to break it down.
> It also makes the media output code more similar to the media input code as well, and it will be easier to merge them for the future.
>
> TBR=henrika@chormium.org
>
> BUG=147327
> TEST=http://chromium.googlecode.com/svn/trunk/samples/audio/visualizer-live.html
> Change the device using the camera icon on the right of the omnibox, then reload. Verify the sound is coming from the correct input device.
>
> Review URL: https://codereview.chromium.org/15836006
TBR=xians@chromium.org
Review URL: https://codereview.chromium.org/16325002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203690 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/notifications')
-rw-r--r-- | chrome/browser/notifications/notification_audio_controller.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/notifications/notification_audio_controller.cc b/chrome/browser/notifications/notification_audio_controller.cc index ec7f090..4fd26c6 100644 --- a/chrome/browser/notifications/notification_audio_controller.cc +++ b/chrome/browser/notifications/notification_audio_controller.cc @@ -251,7 +251,7 @@ bool NotificationAudioController::AudioHandler::StartPlayingSound( if (!params.IsValid()) return false; - stream_ = audio_manager_->MakeAudioOutputStreamProxy(params, std::string()); + stream_ = audio_manager_->MakeAudioOutputStreamProxy(params); if (!stream_->Open()) { DLOG(ERROR) << "Failed to open the output stream"; stream_->Close(); |