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

Unified Diff: chrome/browser/media/router/create_presentation_connection_request.cc

Issue 2488403002: [Media Router] Handle multiple Presentation URLs when creating routes. (Closed)
Patch Set: Created 4 years, 1 month 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: chrome/browser/media/router/create_presentation_connection_request.cc
diff --git a/chrome/browser/media/router/create_presentation_connection_request.cc b/chrome/browser/media/router/create_presentation_connection_request.cc
index 63337c08b8bc81479ea0ac4bf34b1dee893d4289..09b07c5780d2b63b7c2f9c92de29a81133f9f5de 100644
--- a/chrome/browser/media/router/create_presentation_connection_request.cc
+++ b/chrome/browser/media/router/create_presentation_connection_request.cc
@@ -15,12 +15,12 @@ namespace media_router {
CreatePresentationConnectionRequest::CreatePresentationConnectionRequest(
const RenderFrameHostId& render_frame_host_id,
- const GURL& presentation_url,
+ const vector<GURL>& presentation_urls,
const GURL& frame_url,
const PresentationSessionSuccessCallback& success_cb,
const PresentationSessionErrorCallback& error_cb)
: presentation_request_(render_frame_host_id,
- {presentation_url},
+ presentation_urls,
frame_url),
success_cb_(success_cb),
error_cb_(error_cb),
@@ -38,12 +38,12 @@ CreatePresentationConnectionRequest::~CreatePresentationConnectionRequest() {
void CreatePresentationConnectionRequest::InvokeSuccessCallback(
const std::string& presentation_id,
+ const GURL& presentation_url,
const MediaRoute::Id& route_id) {
DCHECK(!cb_invoked_);
if (!cb_invoked_) {
success_cb_.Run(
- content::PresentationSessionInfo(
- presentation_request_.presentation_url(), presentation_id),
+ content::PresentationSessionInfo(presentation_url, presentation_id),
route_id);
cb_invoked_ = true;
}
@@ -67,7 +67,9 @@ void CreatePresentationConnectionRequest::HandleRouteResponse(
content::PRESENTATION_ERROR_UNKNOWN, result.error()));
} else {
presentation_request->InvokeSuccessCallback(
- result.presentation_id(), result.route()->media_route_id());
+ result.presentation_id(),
+ result.presentation_url(),
+ result.route()->media_route_id());
}
}

Powered by Google App Engine
This is Rietveld 408576698