Non-Local Join for Media Router and Presentation API

extensions/renderer/resources/media_router_bindings.js

 // 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.
 
 var mediaRouter;
 
 define('media_router_bindings', [
     'mojo/public/js/bindings',
     'mojo/public/js/core',
     'content/public/renderer/service_provider',
@@ skipping 262 matching lines @@
       'secondary_actions': secondaryActions,
       'help_url': issue.helpUrl,
       'is_blocking': issue.isBlocking
     }));
   };
 
   /**
    * Called by the provider manager when the set of active routes
    * has been updated.
    * @param {!Array<MediaRoute>} routes The active set of media routes.
+   * @param {string=} opt_sourceUrn The sourUrn associated with this route

[imcheng, 2016/01/05 02:12:47]

nit: fix comments. Also comment that it can be empty.

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

Done.

+   *     query.
+   * @param {Array<string>=} opt_joinableRoutes The active set of joinable media

[apacible, 2016/01/05 21:41:58]

op_joinableRouteIds?

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

Done.

+   *     routes.
    */
-  MediaRouter.prototype.onRoutesUpdated = function(routes) {
-    this.service_.onRoutesUpdated(routes.map(routeToMojo_));
+  MediaRouter.prototype.onRoutesUpdated =
+      function(routes, opt_sourceUrn, opt_joinableRouteIds) {
+    this.service_.onRoutesUpdated(
+        routes.map(routeToMojo_),
+        opt_sourceUrn || '',
+        opt_joinableRouteIds || []);
   };
 
   /**
    * Called by the provider manager when sink availability has been updated.
    * @param {!mediaRouterMojom.MediaRouter.SinkAvailability} availability
    *     The new sink availability.
    */
   MediaRouter.prototype.onSinkAvailabilityUpdated = function(availability) {
     this.service_.onSinkAvailabilityUpdated(availability);
   };
@@ skipping 70 matching lines @@
 
     /**
      * @type {function()}
      */
     this.startObservingMediaRoutes = null;
 
     /**
      * @type {function()}
      */
     this.stopObservingMediaRoutes = null;
+
+    /**
+     * @type {function()}
+     */
+    this.connectRouteByRouteId = null;
   };
 
   /**
    * Routes calls from Media Router to the provider manager extension.
    * Registered with the MediaRouter stub.
    * @param {!MediaRouter} MediaRouter proxy to call into the
    * Media Router mojo interface.
    * @constructor
    */
   function MediaRouteProvider(mediaRouter) {
@@ skipping 26 matching lines @@
       'startObservingMediaRoutes',
       'sendRouteMessage',
       'sendRouteBinaryMessage',
       'listenForRouteMessages',
       'stopListeningForRouteMessages',
       'onPresentationSessionDetached',
       'closeRoute',
       'joinRoute',
       'createRoute',
       'stopObservingMediaSinks',
-      'startObservingMediaRoutes'
+      'startObservingMediaRoutes',
+      'connectRouteByRouteId'
     ];
     requiredHandlers.forEach(function(nextHandler) {
       if (handlers[nextHandler] === undefined) {
         console.error(nextHandler + ' handler not registered.');
       }
     });
   }
 
   /**
    * Starts querying for sinks capable of displaying the media source
@@ skipping 58 matching lines @@
     return this.handlers_.joinRoute(sourceUrn, presentationId, origin, tabId)
         .then(function(newRoute) {
           return {route: routeToMojo_(newRoute)};
         },
         function(err) {
           return {error_text: 'Error joining route: ' + err.message};
         });
   };
 
   /**
+   * Handles a request via the Presentation API to join an existing route given
+   * by |sourceUrn| and |routeId|. |origin| and |tabId| are used for
+   * validating same-origin/tab scope.
+   * @param {!string} sourceUrn Media source to render.
+   * @param {!string} routeId Route ID to join.
+   * @param {!string} presentationId Presentation ID to join.
+   * @param {!string} origin Origin of site requesting join.
+   * @param {!number} tabId ID of tab requesting join.
+   * @return {!Promise.<!Object>} A Promise resolving to an object describing
+   *     the newly created media route, or rejecting with an error message on
+   *     failure.
+   */
+  MediaRouteProvider.prototype.connectRouteByRouteId =
+      function(sourceUrn, routeId, presentationId, origin, tabId) {
+    return this.handlers_.connectRouteByRouteId(
+        sourceUrn, routeId, presentationId, origin, tabId)
+        .then(function(newRoute) {
+          return {route: routeToMojo_(newRoute)};
+        },
+        function(err) {
+          return {error_text: 'Error joining route: ' + err.message};
+        });
+  };
+
+  /**
    * Closes the route specified by |routeId|.
    * @param {!string} routeId
    */
   MediaRouteProvider.prototype.closeRoute = function(routeId) {
     this.handlers_.closeRoute(routeId);
   };
 
   /**
    * Posts a message to the route designated by |routeId|.
    * @param {!string} routeId
@@ skipping 60 matching lines @@
    * @param {!string} routeId
    */
   MediaRouteProvider.prototype.onPresentationSessionDetached = function(
       routeId) {
     this.handlers_.onPresentationSessionDetached(routeId);
   };
 
   /**
    * Requests that the provider manager start sending information about active
    * media routes to the Media Router.
+   * @param {!string} sourceUrn
    */
-  MediaRouteProvider.prototype.startObservingMediaRoutes = function() {
-    this.handlers_.startObservingMediaRoutes();
+  MediaRouteProvider.prototype.startObservingMediaRoutes = function(sourceUrn) {
+    this.handlers_.startObservingMediaRoutes(sourceUrn);
   };
 
   /**
    * Requests that the provider manager stop sending information about active
    * media routes to the Media Router.
+   * @param {!string} sourceUrn
    */
-  MediaRouteProvider.prototype.stopObservingMediaRoutes = function() {
-    this.handlers_.stopObservingMediaRoutes();
+  MediaRouteProvider.prototype.stopObservingMediaRoutes = function(sourceUrn) {
+    this.handlers_.stopObservingMediaRoutes(sourceUrn);
   };
 
   mediaRouter = new MediaRouter(connector.bindHandleToProxy(
       serviceProvider.connectToService(
           mediaRouterMojom.MediaRouter.name),
       mediaRouterMojom.MediaRouter));
 
   return mediaRouter;
 });