Chromium Code Reviews| 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..20538ed50f7637c4417d5e5173e0f74862d5826f 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 |
| @@ -83,7 +85,6 @@ cr.define('media_router', function() { |
| var AUTO_CAST_MODE = new CastMode(CastModeType.AUTO, |
| loadTimeData.getString('autoCastMode'), null); |
| - |
| /** |
| * @param {string} id The ID of this issue. |
| * @param {string} title The issue title. |
| @@ -180,7 +181,7 @@ cr.define('media_router', function() { |
| /** @type {?string} */ |
| this.description = description; |
| - /** @type {SinkIconType} */ |
| + /** @type {media_router.SinkIconType} */ |
|
Dan Beam
2015/12/12 01:43:02
nit: ? or !
imcheng
2015/12/14 22:47:00
Done.
|
| this.iconType = iconType; |
| /** @type {media_router.SinkStatus} */ |