Non-Local Join for Media Router and Presentation API

chrome/browser/resources/media_router/elements/media_router_container/media_router_container.js

Index: chrome/browser/resources/media_router/elements/media_router_container/media_router_container.js
diff --git a/chrome/browser/resources/media_router/elements/media_router_container/media_router_container.js b/chrome/browser/resources/media_router/elements/media_router_container/media_router_container.js
index a94a0c4ec513393d4779e6453c97743a43ca3ed9..13d36eea009d27abe767bb87401f45a9ab435789 100644
--- a/chrome/browser/resources/media_router/elements/media_router_container/media_router_container.js
+++ b/chrome/browser/resources/media_router/elements/media_router_container/media_router_container.js
@@ -132,6 +132,16 @@ Polymer({
     },
 
     /**
+     * The list of current joinable routes.
+     * @type {!Array<!media_router.Route>}
+     */
+    joinableRouteList: {

[imcheng, 2015/11/19 18:55:08]

I am a bit confused by this. Why do we have a separate joinableRouteList if we
added a canJoin bit to media_rotuer.Route?

[matt.boetger, 2015/11/24 19:45:23]

It depends where and when you want to set the 'canJoin' bit.  I'm doing it in
this class.  I can move this up into the media_router_interface.js if you
prefer, but that class seemed like it was strictly an interface between the UI
and the Media Router.  In the end, I thought the logic for what to do with those
route ids should rest with the UI code. 

+      type: Array,
+      value: [],
+      observer: 'rebuildRouteMaps_',
+    },
+
+    /**
      * Maps media_router.Route.id to corresponding media_router.Route.
      * @private {!Object<!string, !media_router.Route>}
      */
@@ -644,6 +654,7 @@ Polymer({
 
     // We expect that each route in |routeList| maps to a unique sink.
     this.routeList.forEach(function(route) {
+      route['canJoin'] = false;

[imcheng, 2015/11/19 18:55:08]

Prefer adding canJoin as a field in Route class. Default value can be false.

[matt.boetger, 2015/11/24 19:45:23]

Done.

       this.routeMap_[route.id] = route;
       tempSinkToRouteMap[route.sinkId] = route;
 
@@ -656,6 +667,23 @@ Polymer({
       }
     }, this);
 
+    if (this.joinableRouteList) {
+      // We expect that each route in |routeList| maps to a unique sink.
+      this.joinableRouteList.forEach(function(route) {
+        route['canJoin'] = true;
+        this.routeMap_[route.id] = route;
+        tempSinkToRouteMap[route.sinkId] = route;
+
+        if (route.isLocal) {
+          this.localRouteCount_++;
+
+          // It's OK if localRoute is updated multiple times; it is only used if
+          // |localRouteCount_| == 1, which implies it was only set once.
+          localRoute = route;
+        }
+      }, this);
+    }
+
     // If |currentRoute_| is no longer active, clear |currentRoute_|. Also
     // switch back to the SINK_PICKER view if the user is currently in the
     // ROUTE_DETAILS view.