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..b97793ef405ab50b96c090598fb1aba3f0f2baa7 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()| and |JoinRoute()| and

[mark a. foltz, 2015/12/16 07:17:34]

Nit: use comma instead of multiple "and"s.

[matt.boetger, 2015/12/18 23:37:14]

Done.

+// |ConnectRouteByRouteId|. Callback is

[imcheng, 2015/12/17 02:30:57]

Also ConnectRouteByRouteId() for consistency.

[matt.boetger, 2015/12/18 23:37:14]

Done.

 // invoked when the route request either succeeded or failed.
 // On success:
 // |route|: The route created or joined.
@@ -85,6 +86,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 ConnectRouteByRouteId(

[mark a. foltz, 2015/12/16 07:17:34]

It would be better to keep the nomenclature consistent between the API and the
documentation, so "Connects to" instead of "Joins", here and elsewhere in the
patch.

[matt.boetger, 2015/12/18 23:37:14]

Done.

+      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.