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

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

Issue 2627463003: Convert MediaRouter mojom apis to intake url::Origin objects instead of strings (Closed)
Patch Set: Fix chromeos browser tests Created 3 years, 11 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: chrome/browser/media/router/presentation_service_delegate_impl.cc
diff --git a/chrome/browser/media/router/presentation_service_delegate_impl.cc b/chrome/browser/media/router/presentation_service_delegate_impl.cc
index ba385dcebbcfb22ffd203b33dc3086aeb4549f2c..9dc53a63b8be21f5c2be196b4d66137bc5e2fc9b 100644
--- a/chrome/browser/media/router/presentation_service_delegate_impl.cc
+++ b/chrome/browser/media/router/presentation_service_delegate_impl.cc
@@ -236,7 +236,8 @@ bool PresentationFrame::SetScreenAvailabilityListener(
sinks_observer.reset(new PresentationMediaSinksObserver(
router_, listener, source,
- GetLastCommittedURLForFrame(render_frame_host_id_).GetOrigin()));
+ url::Origin(
+ GetLastCommittedURLForFrame(render_frame_host_id_).GetOrigin())));
if (!sinks_observer->Init()) {
url_to_sinks_observer_.erase(source.id());
@@ -853,7 +854,7 @@ void PresentationServiceDelegateImpl::JoinSession(
weak_factory_.GetWeakPtr(), render_process_id, render_frame_id,
presentation_url, presentation_id, success_cb, error_cb));
router_->JoinRoute(MediaSourceForPresentationUrl(presentation_url).id(),
- presentation_id, origin.GetURL(), web_contents_,
+ presentation_id, origin, web_contents_,
route_response_callbacks, base::TimeDelta(), incognito);
}

Powered by Google App Engine
This is Rietveld 408576698