Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6366)

Unified Diff: chrome/browser/resources/media_router/media_router_ui_interface.js

Issue 1415103006: Non-Local Join for Media Router and Presentation API (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added Unit Tests Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/resources/media_router/media_router_ui_interface.js
diff --git a/chrome/browser/resources/media_router/media_router_ui_interface.js b/chrome/browser/resources/media_router/media_router_ui_interface.js
index 45bee3333154048d339a4b4b54c3960ec96260d4..4e100d7e0e842d2b703216030a84de8ddff77f89 100644
--- a/chrome/browser/resources/media_router/media_router_ui_interface.js
+++ b/chrome/browser/resources/media_router/media_router_ui_interface.js
@@ -67,6 +67,7 @@ cr.define('media_router.ui', function() {
container.deviceMissingUrl = data['deviceMissingUrl'];
container.allSinks = data['sinks'];
container.routeList = data['routes'];
+ container.joinableRouteList = data['joinableRoutes'];
container.initializeCastModes(data['castModes'],
data['initialCastModeType']);
}
@@ -85,9 +86,11 @@ cr.define('media_router.ui', function() {
* Sets the list of currently active routes.
*
* @param {!Array<!media_router.Route>} routeList
+ * @param {!Array<!media_router.Route>} joinableRouteList
*/
- function setRouteList(routeList) {
+ function setRouteList(routeList, joinableRouteList) {
container.routeList = routeList;
imcheng 2015/11/19 18:55:08 I would prefer an updateRouteList method in |conta
matt.boetger 2015/11/24 19:45:24 Done.
+ container.joinableRouteList = joinableRouteList;
}
/**
@@ -144,6 +147,15 @@ cr.define('media_router.browserApi', function() {
}
/**
+ * Joins the given route.
+ *
+ * @param {!media_router.Route} route
+ */
+ function joinRoute(route) {
+ chrome.send('joinRoute', [{sinkId: route.sinkId, routeId: route.id}]);
+ }
+
+ /**
* Reports the current number of sinks.
*
* @param {number} sinkCount
@@ -176,6 +188,7 @@ cr.define('media_router.browserApi', function() {
actOnIssue: actOnIssue,
closeDialog: closeDialog,
closeRoute: closeRoute,
+ joinRoute: joinRoute,
reportSinkCount: reportSinkCount,
requestInitialData: requestInitialData,
requestRoute: requestRoute,

Powered by Google App Engine
This is Rietveld 408576698