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..557f2cac44e659767a6e01da1867029383eb34e3 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 |
@@ -48,7 +48,7 @@ Polymer({ |
/** |
* The current view to be shown. |
- * @private {?media_router.MediaRouterView} |
+ * @private {string} |
*/ |
currentView_: { |
type: String, |
@@ -62,7 +62,7 @@ Polymer({ |
deviceMissingText_: { |
type: String, |
readOnly: true, |
- value: loadTimeData.getString('deviceMissing'), |
+ value: media_router.DEVICE_MISSING_TEXT, |
}, |
/** |
@@ -86,11 +86,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 +110,7 @@ Polymer({ |
issueHeaderText_: { |
type: String, |
readOnly: true, |
- value: loadTimeData.getString('issueHeader'), |
+ value: media_router.ISSUE_HEADER_TEXT, |
}, |
/** |
@@ -158,7 +158,7 @@ Polymer({ |
selectCastModeHeaderText_: { |
type: String, |
readOnly: true, |
- value: loadTimeData.getString('selectCastModeHeader'), |
+ value: media_router.SELECT_CAST_MODE_HEADER_TEXT, |
}, |
/** |
@@ -168,7 +168,7 @@ Polymer({ |
shareYourScreenSubheadingText_: { |
type: String, |
readOnly: true, |
- value: loadTimeData.getString('shareYourScreenSubheading'), |
+ value: media_router.SHARE_YOUR_SCREEN_SUBHEADING_TEXT, |
}, |
/** |
@@ -301,7 +301,7 @@ Polymer({ |
}, |
/** |
- * @param {media_router.MediaRouterView} view The current view. |
+ * @param {string} view The current view. |
* @return {boolean} Whether or not to hide the cast mode list. |
* @private |
*/ |
@@ -344,7 +344,7 @@ Polymer({ |
}, |
/** |
- * @param {media_router.MediaRouterView} view The current view. |
+ * @param {string} view The current view. |
* @param {?media_router.Issue} issue The current issue. |
* @return {boolean} Whether or not to hide the header. |
* @private |
@@ -356,7 +356,7 @@ Polymer({ |
}, |
/** |
- * @param {media_router.MediaRouterView} view The current view. |
+ * @param {string} view The current view. |
* @param {string} headerText The header text for the sink list. |
* @return {string} The text for the header. |
* @private |
@@ -378,7 +378,7 @@ Polymer({ |
}, |
/** |
- * @param {media_router.MediaRouterView} view The current view. |
+ * @param {string} 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 +389,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 +407,7 @@ Polymer({ |
}, |
/** |
- * @param {media_router.MediaRouterView} view The current view. |
+ * @param {string} 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 +430,7 @@ Polymer({ |
}, |
/** |
- * @param {media_router.MediaRouterView} view The current view. |
Dan Beam
2015/12/10 23:41:34
why are you undoing this?
imcheng
2015/12/11 01:14:59
The compiler does not recognize the type. MediaRou
|
+ * @param {string} 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 +487,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 +497,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 +506,7 @@ Polymer({ |
}, |
/** |
- * @param {media_router.MediaRouterView} view The current view. |
+ * @param {string} 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 +530,7 @@ Polymer({ |
if (route && !this.isEmptyOrWhitespace_(route.description)) |
return route.description; |
- return sink.description; |
+ return /** @type {string} */(sink.description); |
}, |
/** |
@@ -803,7 +803,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; |