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

Unified Diff: chrome/browser/resources/media_router/media_router.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: Backwards Compatibility Created 4 years, 12 months 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.js
diff --git a/chrome/browser/resources/media_router/media_router.js b/chrome/browser/resources/media_router/media_router.js
index 0c55b88d95a858285a38a663d047ee9dc9df8218..724c610e9eeb70539b7bdea375918a4f268e6600 100644
--- a/chrome/browser/resources/media_router/media_router.js
+++ b/chrome/browser/resources/media_router/media_router.js
@@ -25,6 +25,7 @@ cr.define('media_router', function() {
container.addEventListener('close-button-click', onCloseDialogEvent);
container.addEventListener('close-dialog', onCloseDialogEvent);
container.addEventListener('close-route-click', onCloseRouteClick);
+ container.addEventListener('join-route-click', onJoinRouteClick);
apacible 2016/01/05 21:41:58 nit: alphabetize after 'issue-action-click' event
matt.boetger 2016/01/06 22:49:07 Done.
container.addEventListener('create-route', onCreateRoute);
container.addEventListener('issue-action-click', onIssueActionClick);
container.addEventListener('report-sink-count', onSinkCountReported);
@@ -74,15 +75,27 @@ cr.define('media_router', function() {
* Stops a route.
* Called when the user requests to stop a media route.
*
- * @param {{detail: {route: string}}} data
+ * @param {{detail: {route: media_router.Route}}} data
* Parameters in |data|.detail:
- * route - route ID.
+ * route - route to close.
*/
function onCloseRouteClick(data) {
media_router.browserApi.closeRoute(data.detail.route);
}
/**
+ * Joins a route.
+ * Called when the user requests to join a media route.
+ *
+ * @param {{detail: {route: media_router.Route}}} data
+ * Parameters in |data|.detail:
+ * route - route to join.
+ */
+ function onJoinRouteClick(data) {
+ media_router.browserApi.joinRoute(data.detail.route);
+ }
+
+ /**
* Reports the current sink count.
* Called 3 seconds after the dialog is initially opened.
*

Powered by Google App Engine
This is Rietveld 408576698