Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(122)

Side by Side Diff: chrome/browser/resources/media_router/media_router_data.js

Issue 1415103006: Non-Local Join for Media Router and Presentation API (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixing ChromeOS System Tray Test Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // Any strings used here will already be localized. Values such as 5 // Any strings used here will already be localized. Values such as
6 // CastMode.type or IDs will be defined elsewhere and determined later. 6 // CastMode.type or IDs will be defined elsewhere and determined later.
7 cr.define('media_router', function() { 7 cr.define('media_router', function() {
8 'use strict'; 8 'use strict';
9 9
10 /** 10 /**
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 }; 126 };
127 127
128 128
129 /** 129 /**
130 * @param {string} id The media route ID. 130 * @param {string} id The media route ID.
131 * @param {string} sinkId The ID of the media sink running this route. 131 * @param {string} sinkId The ID of the media sink running this route.
132 * @param {string} description The short description of this route. 132 * @param {string} description The short description of this route.
133 * @param {?number} tabId The ID of the tab in which web app is running and 133 * @param {?number} tabId The ID of the tab in which web app is running and
134 * accessing the route. 134 * accessing the route.
135 * @param {boolean} isLocal True if this is a locally created route. 135 * @param {boolean} isLocal True if this is a locally created route.
136 * @param {boolean} canJoin True if this route can be joined.
136 * @param {?string} customControllerPath non-empty if this route has custom 137 * @param {?string} customControllerPath non-empty if this route has custom
137 * controller. 138 * controller.
138 * @constructor 139 * @constructor
139 * @struct 140 * @struct
140 */ 141 */
141 var Route = function(id, sinkId, description, tabId, isLocal, 142 var Route = function(id, sinkId, description, tabId, isLocal, canJoin,
142 customControllerPath) { 143 customControllerPath) {
143 /** @type {string} */ 144 /** @type {string} */
144 this.id = id; 145 this.id = id;
145 146
146 /** @type {string} */ 147 /** @type {string} */
147 this.sinkId = sinkId; 148 this.sinkId = sinkId;
148 149
149 /** @type {string} */ 150 /** @type {string} */
150 this.description = description; 151 this.description = description;
151 152
152 /** @type {?number} */ 153 /** @type {?number} */
153 this.tabId = tabId; 154 this.tabId = tabId;
154 155
155 /** @type {boolean} */ 156 /** @type {boolean} */
156 this.isLocal = isLocal; 157 this.isLocal = isLocal;
157 158
159 /** @type {boolean} */
160 this.canJoin = canJoin;
161
158 /** @type {?string} */ 162 /** @type {?string} */
159 this.customControllerPath = customControllerPath; 163 this.customControllerPath = customControllerPath;
160 }; 164 };
161 165
162 166
163 /** 167 /**
164 * @param {string} id The ID of the media sink. 168 * @param {string} id The ID of the media sink.
165 * @param {string} name The name of the sink. 169 * @param {string} name The name of the sink.
166 * @param {?string} description Optional description of the sink. 170 * @param {?string} description Optional description of the sink.
167 * @param {media_router.SinkIconType} iconType the type of icon for the sink. 171 * @param {media_router.SinkIconType} iconType the type of icon for the sink.
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
211 MediaRouterView: MediaRouterView, 215 MediaRouterView: MediaRouterView,
212 SinkIconType: SinkIconType, 216 SinkIconType: SinkIconType,
213 SinkStatus: SinkStatus, 217 SinkStatus: SinkStatus,
214 CastMode: CastMode, 218 CastMode: CastMode,
215 Issue: Issue, 219 Issue: Issue,
216 Route: Route, 220 Route: Route,
217 Sink: Sink, 221 Sink: Sink,
218 TabInfo: TabInfo, 222 TabInfo: TabInfo,
219 }; 223 };
220 }); 224 });
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698