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..ad9be581234731a54995a4df75c6af6f16fac61d 100644
--- a/chrome/browser/media/router/media_router.h
+++ b/chrome/browser/media/router/media_router.h
@@ -32,7 +32,8 @@ class MediaSinksObserver;
 class PresentationConnectionStateObserver;
 class PresentationSessionMessagesObserver;
 
-// Type of callback used in |CreateRoute()| and |JoinRoute()|. Callback is
+// Type of callback used in |CreateRoute()|, |JoinRoute()|, and
+// |ConnectRouteByRouteId()|. Callback is
 // invoked when the route request either succeeded or failed.
 // On success:
 // |route|: The route created or joined.
@@ -85,6 +86,23 @@ class MediaRouter : public KeyedService {
       content::WebContents* web_contents,
       const std::vector<MediaRouteResponseCallback>& callbacks) = 0;
 
+  // Creates a route and connects it to an existing route identified by
+  // |route_id|. This is used for non-local routes since no Presentation ID

[mark a. foltz, 2016/01/05 18:39:40]

Maybe:  "|route_id| must refer to a non-local route, since..."

[matt.boetger, 2016/01/06 22:49:07]

Done.

+  // 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 ConnectRouteByRouteId(
+      const MediaSource::Id& source_id,
+      const MediaRoute::Id& route_id,
+      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.