[MR] Add description field to MediaSink.

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 b655cfe71883ebe720d3924f567ef071dd6c419f..4bb4ac3042d45da1cd4f4fd1715c38e58b40290b 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
@@ -390,27 +390,6 @@ Polymer({
   },
 
   /**
-   * @param {!string} sinkId A sink ID.
-   * @return {boolean} Whether or not to hide the route info in the sink list
-   *     that is associated with |sinkId|.
-   * @private
-   */
-  computeRouteInSinkListHidden_: function(sinkId, sinkToRouteMap) {
-    return !sinkToRouteMap[sinkId];
-  },
-
-  /**
-   * @param {!string} sinkId A sink ID.
-   * @return {string} The description value of the route associated with
-   *     |sinkId|.
-   * @private
-   */
-  computeRouteInSinkListValue_: function(sinkId, sinkToRouteMap) {
-    var route = sinkToRouteMap[sinkId];
-    return route ? route.description : '';
-  },
-
-  /**
    * @param {!Array<!media_router.CastMode>} castModeList The current list of
    *     cast modes.
    * @return {boolean} Whether or not to hide the share screen subheading text.
@@ -446,6 +425,30 @@ Polymer({
   },
 
   /**
+   * Returns the subtext to be shown for |sink|. |computeSinkSubtextHidden_|
+   * should return |false|.
+   * @param {!media_router.Sink} sink
+   * @param {!Object<!string, ?media_router.Route>} sinkToRouteMap
+   * @return {string} The subtext to be shown.
+   * @private
+   */
+  computeSinkSubtext_: function(sink, sinkToRouteMap) {

[apacible, 2015/11/25 23:05:41]

nit: Here and computeSinkSubtextHidden_() -- move after
computeSinkListViewHidden_() for alphabetical order.

[imcheng, 2015/12/01 19:29:27]

Done.

+    var route = sinkToRouteMap[sink.id];
+    return route ? route.description : sink.description;
+  },
+
+  /**
+   * Returns whether the sink subtext <div> for |sink| should be hidden.
+   * @param {!media_router.Sink} sink
+   * @param {!Object<!string, ?media_router.Route>} sinkToRouteMap
+   * @return {boolean} |true| if the subtext <div> should be hidden.
+   * @private
+   */
+  computeSinkSubtextHidden_: function(sink, sinkToRouteMap) {
+    return !sink.description && !sinkToRouteMap[sink.id];

[apacible, 2015/11/25 23:05:41]

Please also check that the strings are not empty/whitespace.

[imcheng, 2015/12/01 19:29:27]

Done.

+  },
+
+  /**
    * @param {!string} sinkId A sink ID.
    * @param {!Object<!string, ?media_router.Route>} sinkToRouteMap
    *     Maps media_router.Sink.id to corresponding media_router.Route.