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

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: Review Fixes Created 5 years 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 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 115
116 /** 116 /**
117 * @param {string} id The media route ID. 117 * @param {string} id The media route ID.
118 * @param {string} sinkId The ID of the media sink running this route. 118 * @param {string} sinkId The ID of the media sink running this route.
119 * @param {string} description The short description of this route. 119 * @param {string} description The short description of this route.
120 * @param {?number} tabId The ID of the tab in which web app is running and 120 * @param {?number} tabId The ID of the tab in which web app is running and
121 * accessing the route. 121 * accessing the route.
122 * @param {boolean} isLocal True if this is a locally created route. 122 * @param {boolean} isLocal True if this is a locally created route.
123 * @param {?string} customControllerPath non-empty if this route has custom 123 * @param {?string} customControllerPath non-empty if this route has custom
124 * controller. 124 * controller.
125 * @param {boolean=} opt_canJoin True if this route can be joined.
imcheng 2015/12/01 23:45:06 why not required?
matt.boetger 2015/12/03 01:19:21 Done.
125 * @constructor 126 * @constructor
126 * @struct 127 * @struct
127 */ 128 */
128 var Route = function(id, sinkId, description, tabId, isLocal, 129 var Route = function(id, sinkId, description, tabId, isLocal,
129 customControllerPath) { 130 customControllerPath, opt_canJoin) {
130 /** @type {string} */ 131 /** @type {string} */
131 this.id = id; 132 this.id = id;
132 133
133 /** @type {string} */ 134 /** @type {string} */
134 this.sinkId = sinkId; 135 this.sinkId = sinkId;
135 136
136 /** @type {string} */ 137 /** @type {string} */
137 this.description = description; 138 this.description = description;
138 139
139 /** @type {?number} */ 140 /** @type {?number} */
140 this.tabId = tabId; 141 this.tabId = tabId;
141 142
142 /** @type {boolean} */ 143 /** @type {boolean} */
143 this.isLocal = isLocal; 144 this.isLocal = isLocal;
144 145
146 /** @type {boolean} */
147 this.canJoin = opt_canJoin || false;
148
145 /** @type {?string} */ 149 /** @type {?string} */
146 this.customControllerPath = customControllerPath; 150 this.customControllerPath = customControllerPath;
147 }; 151 };
148 152
149 153
150 /** 154 /**
151 * @param {string} id The ID of the media sink. 155 * @param {string} id The ID of the media sink.
152 * @param {string} name The name of the sink. 156 * @param {string} name The name of the sink.
153 * @param {media_router.SinkIconType} iconType the type of icon for the sink. 157 * @param {media_router.SinkIconType} iconType the type of icon for the sink.
154 * @param {media_router.SinkStatus} status The readiness state of the sink. 158 * @param {media_router.SinkStatus} status The readiness state of the sink.
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
193 MediaRouterView: MediaRouterView, 197 MediaRouterView: MediaRouterView,
194 SinkIconType: SinkIconType, 198 SinkIconType: SinkIconType,
195 SinkStatus: SinkStatus, 199 SinkStatus: SinkStatus,
196 CastMode: CastMode, 200 CastMode: CastMode,
197 Issue: Issue, 201 Issue: Issue,
198 Route: Route, 202 Route: Route,
199 Sink: Sink, 203 Sink: Sink,
200 TabInfo: TabInfo, 204 TabInfo: TabInfo,
201 }; 205 };
202 }); 206 });
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698