Non-Local Join for Media Router and Presentation API

chrome/browser/media/router/media_router.h

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_MEDIA_ROUTER_MEDIA_ROUTER_H_
 #define CHROME_BROWSER_MEDIA_ROUTER_MEDIA_ROUTER_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 14 matching lines @@
 
 namespace media_router {
 
 class IssuesObserver;
 class LocalMediaRoutesObserver;
 class MediaRoutesObserver;
 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.
 // |presentation_id|:
 //     The presentation ID of the route created or joined. In the case of
 //     |CreateRoute()|, the ID is generated by MediaRouter and is guaranteed to
 //     be unique.
 // |error|: Empty string.
 // On failure:
 // |route|: nullptr
@@ skipping 32 matching lines @@
   // The caller may pass in nullptr for |web_contents| if tab is not applicable.
   // Each callback in |callbacks| is invoked with a response indicating
   // success or failure, in the order they are listed.
   virtual void CreateRoute(
       const MediaSource::Id& source_id,
       const MediaSink::Id& sink_id,
       const GURL& origin,
       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.
   // |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 JoinRoute(
       const MediaSource::Id& source,
@@ skipping 109 matching lines @@
       LocalMediaRoutesObserver* observer) = 0;
 
   // Removes the LocalMediaRoutesObserver |observer|.
   virtual void UnregisterLocalMediaRoutesObserver(
       LocalMediaRoutesObserver* observer) = 0;
 };
 
 }  // namespace media_router
 
 #endif  // CHROME_BROWSER_MEDIA_ROUTER_MEDIA_ROUTER_H_