Index: chrome/browser/resources/media_router/media_router_data.js |
diff --git a/chrome/browser/resources/media_router/media_router_data.js b/chrome/browser/resources/media_router/media_router_data.js |
index 794b171eff26de2b52b27b5d0654dec99c6b7700..21c2c14f246265af027f178c6a5257a49b62430c 100644 |
--- a/chrome/browser/resources/media_router/media_router_data.js |
+++ b/chrome/browser/resources/media_router/media_router_data.js |
@@ -4,62 +4,64 @@ |
// Any strings used here will already be localized. Values such as |
// CastMode.type or IDs will be defined elsewhere and determined later. |
-cr.define('media_router', function() { |
- 'use strict'; |
- |
- /** |
- * This corresponds to the C++ MediaCastMode, with the exception of AUTO. |
- * See below for details. Note to support fast bitset operations, the values |
- * here are (1 << [corresponding value in MR]). |
- * @enum {number} |
- */ |
- var CastModeType = { |
- // Note: AUTO mode is only used to configure the sink list container to show |
- // all sinks. Individual sinks are configured with a specific cast mode |
- // (DEFAULT, TAB_MIRROR, DESKTOP_MIRROR). |
- AUTO: -1, |
- DEFAULT: 0x1, |
- TAB_MIRROR: 0x2, |
- DESKTOP_MIRROR: 0x4, |
- }; |
- |
- /** |
- * The possible states of the Media Router dialog. Used to determine which |
- * components to show. |
- * @enum {string} |
- */ |
- var MediaRouterView = { |
- CAST_MODE_LIST: 'cast-mode-list', |
- FILTER: 'filter', |
- ISSUE: 'issue', |
- ROUTE_DETAILS: 'route-details', |
- SINK_LIST: 'sink-list', |
- }; |
- /** |
- * This corresponds to the C++ MediaSink IconType. |
- * @enum {mumber} |
- */ |
- var SinkIconType = { |
- CAST: 0, |
- CAST_AUDIO: 1, |
- CAST_AUDIO_GROUP: 2, |
- GENERIC: 3, |
- HANGOUT: 4, |
- }; |
- |
- /** |
- * @enum {string} |
- */ |
- var SinkStatus = { |
- IDLE: 'idle', |
- ACTIVE: 'active', |
- REQUEST_PENDING: 'request_pending' |
- }; |
+cr.exportPath('media_router'); |
+ |
+/** |
+ * This corresponds to the C++ MediaCastMode, with the exception of AUTO. |
+ * See below for details. Note to support fast bitset operations, the values |
+ * here are (1 << [corresponding value in MR]). |
+ * @enum {number} |
+ */ |
+media_router.CastModeType = { |
+ // Note: AUTO mode is only used to configure the sink list container to show |
+ // all sinks. Individual sinks are configured with a specific cast mode |
+ // (DEFAULT, TAB_MIRROR, DESKTOP_MIRROR). |
+ AUTO: -1, |
+ DEFAULT: 0x1, |
+ TAB_MIRROR: 0x2, |
+ DESKTOP_MIRROR: 0x4, |
+}; |
+ |
+/** |
+ * The possible states of the Media Router dialog. Used to determine which |
+ * components to show. |
+ * @enum {string} |
+ */ |
+media_router.MediaRouterView = { |
+ CAST_MODE_LIST: 'cast-mode-list', |
+ FILTER: 'filter', |
+ ISSUE: 'issue', |
+ ROUTE_DETAILS: 'route-details', |
+ SINK_LIST: 'sink-list', |
+}; |
+ |
+/** |
+ * This corresponds to the C++ MediaSink IconType. |
+ * @enum {number} |
+ */ |
+media_router.SinkIconType = { |
+ CAST: 0, |
+ CAST_AUDIO: 1, |
+ CAST_AUDIO_GROUP: 2, |
+ GENERIC: 3, |
+ HANGOUT: 4, |
+}; |
+ |
+/** |
+ * @enum {string} |
+ */ |
+media_router.SinkStatus = { |
+ IDLE: 'idle', |
+ ACTIVE: 'active', |
+ REQUEST_PENDING: 'request_pending' |
+}; |
+cr.define('media_router', function() { |
+ 'use strict'; |
/** |
- * @param {media_router.CastModeType} type The type of cast mode. |
+ * @param {number} type The type of cast mode. |
* @param {string} description The description of the cast mode. |
* @param {?string} host The hostname of the site to cast. |
* @constructor |
@@ -80,10 +82,9 @@ cr.define('media_router', function() { |
* Placeholder object for AUTO cast mode. See comment in CastModeType. |
* @const {!media_router.CastMode} |
*/ |
- var AUTO_CAST_MODE = new CastMode(CastModeType.AUTO, |
+ var AUTO_CAST_MODE = new CastMode(media_router.CastModeType.AUTO, |
loadTimeData.getString('autoCastMode'), null); |
- |
/** |
* @param {string} id The ID of this issue. |
* @param {string} title The issue title. |
@@ -180,10 +181,10 @@ cr.define('media_router', function() { |
/** @type {?string} */ |
this.description = description; |
- /** @type {SinkIconType} */ |
+ /** @type {!media_router.SinkIconType} */ |
this.iconType = iconType; |
- /** @type {media_router.SinkStatus} */ |
+ /** @type {!media_router.SinkStatus} */ |
this.status = status; |
/** @type {number} */ |
@@ -207,10 +208,6 @@ cr.define('media_router', function() { |
return { |
AUTO_CAST_MODE: AUTO_CAST_MODE, |
- CastModeType: CastModeType, |
- MediaRouterView: MediaRouterView, |
- SinkIconType: SinkIconType, |
- SinkStatus: SinkStatus, |
CastMode: CastMode, |
Issue: Issue, |
Route: Route, |