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

Unified Diff: media/blink/webmediaplayer_impl.cc

Issue 1323403005: Allow AudioOutputDevice objects to be initialized with a specific hardware output device and store … (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Palmer's comments Created 5 years, 3 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 side-by-side diff with in-line comments
Download patch
Index: media/blink/webmediaplayer_impl.cc
diff --git a/media/blink/webmediaplayer_impl.cc b/media/blink/webmediaplayer_impl.cc
index 2cb8eccf5171862b7d9843e2e5f7c05e2fe5ee06..2b7cd1ab3e385e2d7a951b4ccdd3c8f77e3c734b 100644
--- a/media/blink/webmediaplayer_impl.cc
+++ b/media/blink/webmediaplayer_impl.cc
@@ -406,10 +406,11 @@ void WebMediaPlayerImpl::setSinkId(const blink::WebString& device_id,
OutputDevice* output_device = audio_source_provider_->GetOutputDevice();
if (output_device) {
std::string device_id_str(device_id.utf8());
- GURL security_origin(frame_->securityOrigin().toString().utf8());
+ url::Origin security_origin(
+ GURL(frame_->securityOrigin().toString().utf8()));
output_device->SwitchOutputDevice(device_id_str, security_origin, callback);
} else {
- callback.Run(SWITCH_OUTPUT_DEVICE_RESULT_ERROR_NOT_SUPPORTED);
+ callback.Run(SWITCH_OUTPUT_DEVICE_RESULT_ERROR_INTERNAL);
}
}

Powered by Google App Engine
This is Rietveld 408576698