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

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

Issue 2379703002: [Presentation API] (alternative) 1-UA: send message between controller and receiver page (Closed)
Patch Set: merge with master 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..e968b0dbbacd23dca62948b6a2e9066d85f6f166 100644
--- a/chrome/browser/media/router/create_presentation_connection_request.cc
+++ b/chrome/browser/media/router/create_presentation_connection_request.cc
@@ -38,13 +38,13 @@ CreatePresentationConnectionRequest::~CreatePresentationConnectionRequest() {
void CreatePresentationConnectionRequest::InvokeSuccessCallback(
const std::string& presentation_id,
- const MediaRoute::Id& route_id) {
+ const MediaRoute& route) {
DCHECK(!cb_invoked_);
if (!cb_invoked_) {
- success_cb_.Run(
- content::PresentationSessionInfo(
- presentation_request_.presentation_url(), presentation_id),
- route_id);
+ success_cb_.Run(content::PresentationSessionInfo(
+ presentation_request_.presentation_url(),
+ presentation_id, route.is_offscreen_presentation()),
+ route);
cb_invoked_ = true;
}
}
@@ -66,8 +66,8 @@ void CreatePresentationConnectionRequest::HandleRouteResponse(
presentation_request->InvokeErrorCallback(content::PresentationError(
content::PRESENTATION_ERROR_UNKNOWN, result.error()));
} else {
- presentation_request->InvokeSuccessCallback(
- result.presentation_id(), result.route()->media_route_id());
+ presentation_request->InvokeSuccessCallback(result.presentation_id(),
+ *result.route());
}
}

Powered by Google App Engine
This is Rietveld 408576698