| 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 f9e561f4e66e8cb21785428b6d58b95677595c7c..d5974ba488e65a2a7e7fa24fcd165b744b20f6ff 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
|
| @@ -52,7 +52,7 @@ Polymer({
|
| */
|
| currentView_: {
|
| type: String,
|
| - value: '',
|
| + value: null,
|
| },
|
|
|
| /**
|
| @@ -62,7 +62,9 @@ Polymer({
|
| deviceMissingText_: {
|
| type: String,
|
| readOnly: true,
|
| - value: loadTimeData.getString('deviceMissing'),
|
| + value: function() {
|
| + return loadTimeData.getString('deviceMissing');
|
| + },
|
| },
|
|
|
| /**
|
| @@ -86,11 +88,11 @@ Polymer({
|
| /**
|
| * The header text tooltip. This would be descriptive of the
|
| * source origin, whether a host name, tab URL, etc.
|
| - * @type {string}
|
| + * @type {?string}
|
| */
|
| headerTextTooltip: {
|
| type: String,
|
| - value: '',
|
| + value: null,
|
| },
|
|
|
| /**
|
| @@ -110,7 +112,9 @@ Polymer({
|
| issueHeaderText_: {
|
| type: String,
|
| readOnly: true,
|
| - value: loadTimeData.getString('issueHeader'),
|
| + value: function() {
|
| + return loadTimeData.getString('issueHeader');
|
| + },
|
| },
|
|
|
| /**
|
| @@ -158,7 +162,9 @@ Polymer({
|
| selectCastModeHeaderText_: {
|
| type: String,
|
| readOnly: true,
|
| - value: loadTimeData.getString('selectCastModeHeader'),
|
| + value: function() {
|
| + return loadTimeData.getString('selectCastModeHeader');
|
| + },
|
| },
|
|
|
| /**
|
| @@ -168,7 +174,9 @@ Polymer({
|
| shareYourScreenSubheadingText_: {
|
| type: String,
|
| readOnly: true,
|
| - value: loadTimeData.getString('shareYourScreenSubheading'),
|
| + value: function() {
|
| + return loadTimeData.getString('shareYourScreeenSubheading');
|
| + },
|
| },
|
|
|
| /**
|
| @@ -301,7 +309,7 @@ Polymer({
|
| },
|
|
|
| /**
|
| - * @param {media_router.MediaRouterView} view The current view.
|
| + * @param {?media_router.MediaRouterView} view The current view.
|
| * @return {boolean} Whether or not to hide the cast mode list.
|
| * @private
|
| */
|
| @@ -344,7 +352,7 @@ Polymer({
|
| },
|
|
|
| /**
|
| - * @param {media_router.MediaRouterView} view The current view.
|
| + * @param {?media_router.MediaRouterView} view The current view.
|
| * @param {?media_router.Issue} issue The current issue.
|
| * @return {boolean} Whether or not to hide the header.
|
| * @private
|
| @@ -356,7 +364,7 @@ Polymer({
|
| },
|
|
|
| /**
|
| - * @param {media_router.MediaRouterView} view The current view.
|
| + * @param {?media_router.MediaRouterView} view The current view.
|
| * @param {string} headerText The header text for the sink list.
|
| * @return {string} The text for the header.
|
| * @private
|
| @@ -378,7 +386,7 @@ Polymer({
|
| },
|
|
|
| /**
|
| - * @param {media_router.MediaRouterView} view The current view.
|
| + * @param {?media_router.MediaRouterView} view The current view.
|
| * @param {string} headerTooltip The tooltip for the header for the sink
|
| * list.
|
| * @return {string} The tooltip for the header.
|
| @@ -389,8 +397,8 @@ Polymer({
|
| },
|
|
|
| /**
|
| - * @param {string} The ID of the sink that is currently launching, or empty
|
| - * string if none exists.
|
| + * @param {string} currentLaunchingSinkId ID of the sink that is currently
|
| + * launching, or empty string if none exists.
|
| * @private
|
| */
|
| computeIsLaunching_: function(currentLaunchingSinkId) {
|
| @@ -407,7 +415,7 @@ Polymer({
|
| },
|
|
|
| /**
|
| - * @param {media_router.MediaRouterView} view The current view.
|
| + * @param {?media_router.MediaRouterView} view The current view.
|
| * @param {?media_router.Issue} issue The current issue.
|
| * @return {boolean} Whether or not to show the issue banner.
|
| * @private
|
| @@ -430,7 +438,7 @@ Polymer({
|
| },
|
|
|
| /**
|
| - * @param {media_router.MediaRouterView} view The current view.
|
| + * @param {?media_router.MediaRouterView} view The current view.
|
| * @param {?media_router.Issue} issue The current issue.
|
| * @return {boolean} Whether or not to hide the route details.
|
| * @private
|
| @@ -487,7 +495,7 @@ Polymer({
|
| },
|
|
|
| /**
|
| - * @param {!string} currentLauchingSinkid The ID of the sink that is
|
| + * @param {!string} currentLaunchingSinkId The ID of the sink that is
|
| * currently launching.
|
| * @param {!string} sinkId A sink ID.
|
| * @private
|
| @@ -497,7 +505,7 @@ Polymer({
|
| },
|
|
|
| /**
|
| - * @param {!Array<!media_router.Sink>} The list of sinks.
|
| + * @param {!Array<!media_router.Sink>} sinksToShow The list of sinks.
|
| * @return {boolean} Whether or not to hide the sink list.
|
| * @private
|
| */
|
| @@ -506,7 +514,7 @@ Polymer({
|
| },
|
|
|
| /**
|
| - * @param {media_router.MediaRouterView} view The current view.
|
| + * @param {?media_router.MediaRouterView} view The current view.
|
| * @param {?media_router.Issue} issue The current issue.
|
| * @return {boolean} Whether or not to hide entire the sink list view.
|
| * @private
|
| @@ -530,7 +538,7 @@ Polymer({
|
| if (route && !this.isEmptyOrWhitespace_(route.description))
|
| return route.description;
|
|
|
| - return sink.description;
|
| + return /** @type {string} */(sink.description);
|
| },
|
|
|
| /**
|
| @@ -803,7 +811,7 @@ Polymer({
|
| * @param {!media_router.CastMode} castMode
|
| */
|
| setShownCastMode_: function(castMode) {
|
| - if (this.shownCastMode_ == castMode.type)
|
| + if (this.shownCastModeValue_ == castMode.type)
|
| return;
|
|
|
| this.shownCastModeValue_ = castMode.type;
|
|
|