Non-Local Join for Media Router and Presentation API

chrome/browser/media/router/media_router.h

Index: chrome/browser/media/router/media_router.h
diff --git a/chrome/browser/media/router/media_router.h b/chrome/browser/media/router/media_router.h
index fc9079f0f86be1dbaa08c34476ac236fa85bcd94..9373f9d9eafe839c38382b871985bfe89be73d34 100644
--- a/chrome/browser/media/router/media_router.h
+++ b/chrome/browser/media/router/media_router.h
@@ -85,6 +85,22 @@ class MediaRouter : public KeyedService {
       content::WebContents* web_contents,
       const std::vector<MediaRouteResponseCallback>& callbacks) = 0;
 
+  // Joins an existing route identified by |route_id|. This is used for
+  // non-local routes since no Presentation ID is available.
+  // |source|: The source to route to the existing route.
+  // |route_id|: Route ID of the existing route.
+  // |origin|, |web_contents|: Origin and WebContents of the join route request.
+  // Used for validation when enforcing same-origin and/or same-tab scope.
+  // (See CreateRoute documentation).
+  // Each callback in |callbacks| is invoked with a response indicating
+  // success or failure, in the order they are listed.
+  virtual void JoinRouteByRouteId(
+      const MediaSource::Id& source,

[mark a. foltz, 2015/12/03 19:24:23]

source_id for consistency with CreateRoute

[matt.boetger, 2015/12/15 19:21:20]

Done.

+      const MediaRoute::Id& route_id,

[mark a. foltz, 2015/12/03 19:24:23]

Note, the route_id should include the source_id (or the source could be looked
up it).  But fine to keep it here for consistency with CreateRoute() and
JoinRoute().

[mark a. foltz, 2015/12/09 00:48:16]

You can ignore this comment.

[matt.boetger, 2015/12/15 19:21:20]

Done.

[matt.boetger, 2015/12/15 19:21:20]

Done.

+      const GURL& origin,
+      content::WebContents* web_contents,
+      const std::vector<MediaRouteResponseCallback>& callbacks) = 0;
+
   // Joins an existing route identified by |presentation_id|.
   // |source|: The source to route to the existing route.
   // |presentation_id|: Presentation ID of the existing route.