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

Unified Diff: chrome/browser/resources/media_router/elements/route_details/route_details.js

Issue 2002293003: [Media Router] Allow casting new media to sink with existing route. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Responding to apacible's comments Created 4 years, 7 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/elements/route_details/route_details.js
diff --git a/chrome/browser/resources/media_router/elements/route_details/route_details.js b/chrome/browser/resources/media_router/elements/route_details/route_details.js
index d3db440a8042f08e4e0e3d4d2d61e075ae257cf2..3283b0165f2ce63532900b521feca6cfebe67497 100644
--- a/chrome/browser/resources/media_router/elements/route_details/route_details.js
+++ b/chrome/browser/resources/media_router/elements/route_details/route_details.js
@@ -17,6 +17,16 @@ Polymer({
},
/**
+ * Bitmask of available cast modes compatible with the sink of the current
+ * route.
+ * @type {number}
+ */
+ availableCastModes: {
+ type: Number,
+ value: 0,
+ },
+
+ /**
* Whether the browser is currently incognito.
* @type {boolean|undefined}
*/
@@ -60,13 +70,28 @@ Polymer({
},
/**
- * Fires a start-casting-to-route-click event. This is called when the button
- * to start casting to the current route is clicked.
+ * @param {?media_router.Route|undefined} route
+ * @param {number} availableCastModes
+ * @return {boolean} Whether to show the button that allows casting to the
+ * current route or the current route's sink.
+ */
+ computeCastButtonHidden_: function(route, availableCastModes) {
+ return !(route && route.canJoin) && !availableCastModes;
+ },
+
+ /**
+ * Fires a join-route-click event if the current route is joinable, otherwise
+ * it fires a cast-new-media-click event. This is called when the button to
apacible 2016/05/25 22:37:01 nit: "... a cast-new-media-click event, which stop
btolsch 2016/05/26 00:31:12 Done.
+ * start casting to the current route is clicked.
*
* @private
*/
startCastingToRoute_: function() {
- this.fire('start-casting-to-route-click', {route: this.route});
+ if (this.route.canJoin) {
+ this.fire('join-route-click', {route: this.route});
+ } else {
+ this.fire('cast-new-media-click', {route: this.route});
apacible 2016/05/25 22:37:01 What happens if there's already a pending created
btolsch 2016/05/26 00:31:12 Currently, only the sink for this route would show
+ }
},
/**

Powered by Google App Engine
This is Rietveld 408576698